[Telepathy-commits] [telepathy-gabble/master] rename gabble-types.h to types.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:14 PDT 2008
20080714115830-c9803-7d733e4f99dd33ecb482dd00188ccb38f34c14a6.gz
---
src/Makefile.am | 2 +-
src/bytestream-factory.h | 2 +-
src/connection.h | 2 +-
src/disco.h | 2 +-
src/gabble-types.h | 67 ----------------------------------------------
src/media-session.h | 2 +-
src/media-stream.h | 2 +-
src/muc-channel.h | 2 +-
src/muc-factory.h | 2 +-
src/presence.h | 2 +-
src/request-pipeline.h | 2 +-
src/roster-channel.h | 2 +-
src/roster.h | 2 +-
src/types.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++
src/util.h | 2 +-
src/vcard-manager.h | 2 +-
16 files changed, 81 insertions(+), 81 deletions(-)
delete mode 100644 src/gabble-types.h
create mode 100644 src/types.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 69ce459..53b8201 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,7 @@ libgabble_convenience_la_our_sources = \
gabble-roster-channel.c \
roomlist-channel.h \
gabble-roomlist-channel.c \
- gabble-types.h \
+ types.h \
im-factory.h \
im-factory.c \
media-factory.h \
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 66189ff..9548fbf 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -24,7 +24,7 @@
#include <loudmouth/loudmouth.h>
#include <telepathy-glib/base-connection.h>
-#include "gabble-types.h"
+#include "types.h"
#include "bytestream-iface.h"
#include "bytestream-ibb.h"
#include "bytestream-muc.h"
diff --git a/src/connection.h b/src/connection.h
index 3c01528..2cc329e 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -27,7 +27,7 @@
#include <telepathy-glib/base-connection.h>
#include <telepathy-glib/presence-mixin.h>
-#include "gabble-types.h"
+#include "types.h"
#include "error.h"
#include "muc-factory.h"
diff --git a/src/disco.h b/src/disco.h
index 23684fd..5951645 100644
--- a/src/disco.h
+++ b/src/disco.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/gabble-types.h b/src/gabble-types.h
deleted file mode 100644
index a36eb3a..0000000
--- a/src/gabble-types.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * gabble-types.h - Header for Gabble type definitions
- *
- * Copyright (C) 2006 Collabora Ltd.
- * Copyright (C) 2006 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef __GABBLE_TYPES_H__
-#define __GABBLE_TYPES_H__
-
-#include <config.h>
-
-#include <telepathy-glib/handle.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleConnection GabbleConnection;
-typedef struct _GabbleDisco GabbleDisco;
-typedef struct _GabbleMucChannel GabbleMucChannel;
-typedef struct _GabblePresence GabblePresence;
-typedef struct _GabblePresenceCache GabblePresenceCache;
-typedef struct _GabbleRoster GabbleRoster;
-typedef struct _GabbleRosterChannel GabbleRosterChannel;
-typedef struct _GabbleVCardManager GabbleVCardManager;
-typedef struct _GabbleBytestreamFactory GabbleBytestreamFactory;
-typedef struct _GabblePrivateTubesFactory GabblePrivateTubesFactory;
-typedef struct _GabbleRequestPipeline GabbleRequestPipeline;
-
-typedef enum {
- INITIATOR_INVALID = -1,
- INITIATOR_LOCAL = 0,
- INITIATOR_REMOTE,
-} JingleInitiator;
-
-typedef enum {
- PRESENCE_CAP_NONE = 0,
- PRESENCE_CAP_GOOGLE_TRANSPORT_P2P = 1 << 0,
- PRESENCE_CAP_GOOGLE_VOICE = 1 << 1,
- PRESENCE_CAP_JINGLE = 1 << 2,
- PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO = 1 << 3,
- PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO = 1 << 4,
- PRESENCE_CAP_CHAT_STATES = 1 << 5,
- PRESENCE_CAP_SI = 1 << 6,
- PRESENCE_CAP_BYTESTREAMS = 1 << 7,
- PRESENCE_CAP_IBB = 1 << 8,
- PRESENCE_CAP_SI_TUBES = 1 << 9,
- PRESENCE_CAP_FILE_TRANSFER = 1 << 10,
- PRESENCE_CAP_OLPC_1 = 1 << 11
-} GabblePresenceCapabilities;
-
-G_END_DECLS
-
-#endif
diff --git a/src/media-session.h b/src/media-session.h
index 6094e3e..5ce24dd 100644
--- a/src/media-session.h
+++ b/src/media-session.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
#include "media-stream.h"
#include <telepathy-glib/enums.h>
diff --git a/src/media-stream.h b/src/media-stream.h
index af0540b..794f84e 100644
--- a/src/media-stream.h
+++ b/src/media-stream.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
#include <telepathy-glib/enums.h>
G_BEGIN_DECLS
diff --git a/src/muc-channel.h b/src/muc-channel.h
index 7ef05b6..610af9a 100644
--- a/src/muc-channel.h
+++ b/src/muc-channel.h
@@ -28,7 +28,7 @@
#include <telepathy-glib/group-mixin.h>
#include <telepathy-glib/properties-mixin.h>
-#include "gabble-types.h"
+#include "types.h"
#include "text-mixin.h"
G_BEGIN_DECLS
diff --git a/src/muc-factory.h b/src/muc-factory.h
index 8319000..150e609 100644
--- a/src/muc-factory.h
+++ b/src/muc-factory.h
@@ -23,7 +23,7 @@
#include <glib-object.h>
#include "bytestream-iface.h"
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/presence.h b/src/presence.h
index 26407b0..cf6a306 100644
--- a/src/presence.h
+++ b/src/presence.h
@@ -25,7 +25,7 @@
#include <glib-object.h>
#include "connection.h"
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/request-pipeline.h b/src/request-pipeline.h
index 145554d..5cdde83 100644
--- a/src/request-pipeline.h
+++ b/src/request-pipeline.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/roster-channel.h b/src/roster-channel.h
index 30267e7..896454f 100644
--- a/src/roster-channel.h
+++ b/src/roster-channel.h
@@ -26,7 +26,7 @@
#include <telepathy-glib/group-mixin.h>
#include <telepathy-glib/intset.h>
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/roster.h b/src/roster.h
index a5749ad..bba81c3 100644
--- a/src/roster.h
+++ b/src/roster.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/types.h b/src/types.h
new file mode 100644
index 0000000..a36eb3a
--- /dev/null
+++ b/src/types.h
@@ -0,0 +1,67 @@
+/*
+ * gabble-types.h - Header for Gabble type definitions
+ *
+ * Copyright (C) 2006 Collabora Ltd.
+ * Copyright (C) 2006 Nokia Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __GABBLE_TYPES_H__
+#define __GABBLE_TYPES_H__
+
+#include <config.h>
+
+#include <telepathy-glib/handle.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleConnection GabbleConnection;
+typedef struct _GabbleDisco GabbleDisco;
+typedef struct _GabbleMucChannel GabbleMucChannel;
+typedef struct _GabblePresence GabblePresence;
+typedef struct _GabblePresenceCache GabblePresenceCache;
+typedef struct _GabbleRoster GabbleRoster;
+typedef struct _GabbleRosterChannel GabbleRosterChannel;
+typedef struct _GabbleVCardManager GabbleVCardManager;
+typedef struct _GabbleBytestreamFactory GabbleBytestreamFactory;
+typedef struct _GabblePrivateTubesFactory GabblePrivateTubesFactory;
+typedef struct _GabbleRequestPipeline GabbleRequestPipeline;
+
+typedef enum {
+ INITIATOR_INVALID = -1,
+ INITIATOR_LOCAL = 0,
+ INITIATOR_REMOTE,
+} JingleInitiator;
+
+typedef enum {
+ PRESENCE_CAP_NONE = 0,
+ PRESENCE_CAP_GOOGLE_TRANSPORT_P2P = 1 << 0,
+ PRESENCE_CAP_GOOGLE_VOICE = 1 << 1,
+ PRESENCE_CAP_JINGLE = 1 << 2,
+ PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO = 1 << 3,
+ PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO = 1 << 4,
+ PRESENCE_CAP_CHAT_STATES = 1 << 5,
+ PRESENCE_CAP_SI = 1 << 6,
+ PRESENCE_CAP_BYTESTREAMS = 1 << 7,
+ PRESENCE_CAP_IBB = 1 << 8,
+ PRESENCE_CAP_SI_TUBES = 1 << 9,
+ PRESENCE_CAP_FILE_TRANSFER = 1 << 10,
+ PRESENCE_CAP_OLPC_1 = 1 << 11
+} GabblePresenceCapabilities;
+
+G_END_DECLS
+
+#endif
diff --git a/src/util.h b/src/util.h
index 77ff65d..810b7ee 100644
--- a/src/util.h
+++ b/src/util.h
@@ -29,7 +29,7 @@
#include <telepathy-glib/util.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
#include "sha1/sha1.h"
gchar *sha1_hex (const gchar *bytes, guint len);
diff --git a/src/vcard-manager.h b/src/vcard-manager.h
index 52d5541..85ca94c 100644
--- a/src/vcard-manager.h
+++ b/src/vcard-manager.h
@@ -25,7 +25,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "gabble-types.h"
+#include "types.h"
G_BEGIN_DECLS
--
1.5.6.3
More information about the Telepathy-commits
mailing list