[telepathy-gabble/master] Make GabblePresenceCapabilities, Feature local to capabilities.c

[Simon McVittie]

---
 src/capabilities.c |   38 ++++++++++++++++++++++++++++++++++++++
 src/capabilities.h |   13 -------------
 src/types.h        |   25 -------------------------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 75c4ca8..231091e 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -38,6 +38,44 @@
 #include "media-channel.h"
 #include "util.h"
 
+typedef enum {
+    PRESENCE_CAP_NONE = 0,
+    PRESENCE_CAP_GOOGLE_TRANSPORT_P2P = 1 << 0,
+    PRESENCE_CAP_GOOGLE_VOICE = 1 << 1,
+    PRESENCE_CAP_JINGLE015 = 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_OLPC_1 = 1 << 11,
+    PRESENCE_CAP_JINGLE_RTP = 1 << 12,
+    PRESENCE_CAP_JINGLE032 = 1 << 13,
+    PRESENCE_CAP_JINGLE_TRANSPORT_ICEUDP = 1 << 14,
+    PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP = 1 << 15,
+    PRESENCE_CAP_GEOLOCATION = 1 << 16,
+    PRESENCE_CAP_SI_FILE_TRANSFER = 1 << 17,
+    PRESENCE_CAP_JINGLE_OMITS_CONTENT_CREATOR = 1 << 18,
+    PRESENCE_CAP_GOOGLE_VIDEO = 1 << 19,
+    PRESENCE_CAP_JINGLE_RTP_AUDIO = 1 << 20,
+    PRESENCE_CAP_JINGLE_RTP_VIDEO = 1 << 21,
+} GabblePresenceCapabilities;
+
+typedef struct _Feature Feature;
+
+struct _Feature
+{
+  enum {
+    FEATURE_FIXED,
+    FEATURE_OPTIONAL,
+    FEATURE_BUNDLE_COMPAT   /* just for voice-v1/video-v1 */
+  } feature_type;
+  gchar *ns;
+  GabblePresenceCapabilities caps;
+};
+
 static const Feature self_advertised_features[] =
 {
   { FEATURE_FIXED, NS_GOOGLE_FEAT_SESSION, 0},
diff --git a/src/capabilities.h b/src/capabilities.h
index 8492bdf..c371b27 100644
--- a/src/capabilities.h
+++ b/src/capabilities.h
@@ -27,19 +27,6 @@
 
 #include "types.h"
 
-typedef struct _Feature Feature;
-
-struct _Feature
-{
-  enum {
-    FEATURE_FIXED,
-    FEATURE_OPTIONAL,
-    FEATURE_BUNDLE_COMPAT   /* just for voice-v1/video-v1 */
-  } feature_type;
-  gchar *ns;
-  GabblePresenceCapabilities caps;
-};
-
 /* Pseudo-capabilities for buggy or strange implementations, represented as
  * strings starting with a character not allowed in XML (the ASCII beep :-) */
 #define QUIRK_PREFIX_CHAR '\x07'
diff --git a/src/types.h b/src/types.h
index 9384301..01d8a4d 100644
--- a/src/types.h
+++ b/src/types.h
@@ -59,31 +59,6 @@ typedef enum {
     INITIATOR_REMOTE,
 } JingleInitiator;
 
-typedef enum {
-    PRESENCE_CAP_NONE = 0,
-    PRESENCE_CAP_GOOGLE_TRANSPORT_P2P = 1 << 0,
-    PRESENCE_CAP_GOOGLE_VOICE = 1 << 1,
-    PRESENCE_CAP_JINGLE015 = 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_OLPC_1 = 1 << 11,
-    PRESENCE_CAP_JINGLE_RTP = 1 << 12,
-    PRESENCE_CAP_JINGLE032 = 1 << 13,
-    PRESENCE_CAP_JINGLE_TRANSPORT_ICEUDP = 1 << 14,
-    PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP = 1 << 15,
-    PRESENCE_CAP_GEOLOCATION = 1 << 16,
-    PRESENCE_CAP_SI_FILE_TRANSFER = 1 << 17,
-    PRESENCE_CAP_JINGLE_OMITS_CONTENT_CREATOR = 1 << 18,
-    PRESENCE_CAP_GOOGLE_VIDEO = 1 << 19,
-    PRESENCE_CAP_JINGLE_RTP_AUDIO = 1 << 20,
-    PRESENCE_CAP_JINGLE_RTP_VIDEO = 1 << 21,
-} GabblePresenceCapabilities;
-
 G_END_DECLS
 
 #endif
-- 
1.5.6.5