[telepathy-gabble/master] Remove GabblePresenceCapabilities altogether

[Simon McVittie]

---
 src/capabilities.c |   87 +++++++++++++++++----------------------------------
 1 files changed, 29 insertions(+), 58 deletions(-)

diff --git a/src/capabilities.c b/src/capabilities.c
index 231091e..166d77d 100644
--- a/src/capabilities.c
+++ b/src/capabilities.c
@@ -38,31 +38,6 @@
 #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
@@ -73,50 +48,46 @@ struct _Feature
     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},
-  { FEATURE_FIXED, NS_GOOGLE_TRANSPORT_P2P, PRESENCE_CAP_GOOGLE_TRANSPORT_P2P},
-  { FEATURE_FIXED, NS_JINGLE_TRANSPORT_RAWUDP, PRESENCE_CAP_JINGLE_TRANSPORT_RAWUDP},
-  { FEATURE_FIXED, NS_JINGLE_TRANSPORT_ICEUDP, PRESENCE_CAP_JINGLE_TRANSPORT_ICEUDP},
-  { FEATURE_FIXED, NS_JINGLE015, PRESENCE_CAP_JINGLE015},
-  { FEATURE_FIXED, NS_JINGLE032, PRESENCE_CAP_JINGLE032},
-  { FEATURE_FIXED, NS_CHAT_STATES, PRESENCE_CAP_CHAT_STATES},
-  { FEATURE_FIXED, NS_NICK, 0},
-  { FEATURE_FIXED, NS_NICK "+notify", 0},
-  { FEATURE_FIXED, NS_SI, PRESENCE_CAP_SI},
-  { FEATURE_FIXED, NS_IBB, PRESENCE_CAP_IBB},
-  { FEATURE_FIXED, NS_TUBES, PRESENCE_CAP_SI_TUBES},
-  { FEATURE_FIXED, NS_BYTESTREAMS, PRESENCE_CAP_BYTESTREAMS},
-  { FEATURE_FIXED, NS_FILE_TRANSFER, PRESENCE_CAP_SI_FILE_TRANSFER},
-
-  { FEATURE_BUNDLE_COMPAT, NS_GOOGLE_FEAT_VOICE, PRESENCE_CAP_GOOGLE_VOICE},
-  { FEATURE_OPTIONAL, NS_GOOGLE_FEAT_VIDEO, PRESENCE_CAP_GOOGLE_VIDEO },
-  { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_AUDIO,
-    PRESENCE_CAP_JINGLE_DESCRIPTION_AUDIO},
-  { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_VIDEO,
-    PRESENCE_CAP_JINGLE_DESCRIPTION_VIDEO},
-  { FEATURE_OPTIONAL, NS_JINGLE_RTP, PRESENCE_CAP_JINGLE_RTP },
-  { FEATURE_OPTIONAL, NS_JINGLE_RTP_AUDIO, PRESENCE_CAP_JINGLE_RTP_AUDIO },
-  { FEATURE_OPTIONAL, NS_JINGLE_RTP_VIDEO, PRESENCE_CAP_JINGLE_RTP_VIDEO },
-
-  { FEATURE_OPTIONAL, NS_OLPC_BUDDY_PROPS "+notify", PRESENCE_CAP_OLPC_1},
-  { FEATURE_OPTIONAL, NS_OLPC_ACTIVITIES "+notify", PRESENCE_CAP_OLPC_1},
-  { FEATURE_OPTIONAL, NS_OLPC_CURRENT_ACTIVITY "+notify", PRESENCE_CAP_OLPC_1},
-  { FEATURE_OPTIONAL, NS_OLPC_ACTIVITY_PROPS "+notify", PRESENCE_CAP_OLPC_1},
-
-  { FEATURE_OPTIONAL, NS_GEOLOC "+notify", PRESENCE_CAP_GEOLOCATION},
-
-  { 0, NULL, 0}
+  { FEATURE_FIXED, NS_GOOGLE_FEAT_SESSION },
+  { FEATURE_FIXED, NS_GOOGLE_TRANSPORT_P2P },
+  { FEATURE_FIXED, NS_JINGLE_TRANSPORT_RAWUDP },
+  { FEATURE_FIXED, NS_JINGLE_TRANSPORT_ICEUDP },
+  { FEATURE_FIXED, NS_JINGLE015 },
+  { FEATURE_FIXED, NS_JINGLE032 },
+  { FEATURE_FIXED, NS_CHAT_STATES },
+  { FEATURE_FIXED, NS_NICK },
+  { FEATURE_FIXED, NS_NICK "+notify" },
+  { FEATURE_FIXED, NS_SI },
+  { FEATURE_FIXED, NS_IBB },
+  { FEATURE_FIXED, NS_TUBES },
+  { FEATURE_FIXED, NS_BYTESTREAMS },
+  { FEATURE_FIXED, NS_FILE_TRANSFER },
+
+  { FEATURE_BUNDLE_COMPAT, NS_GOOGLE_FEAT_VOICE },
+  { FEATURE_OPTIONAL, NS_GOOGLE_FEAT_VIDEO },
+  { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_AUDIO },
+  { FEATURE_OPTIONAL, NS_JINGLE_DESCRIPTION_VIDEO },
+  { FEATURE_OPTIONAL, NS_JINGLE_RTP },
+  { FEATURE_OPTIONAL, NS_JINGLE_RTP_AUDIO },
+  { FEATURE_OPTIONAL, NS_JINGLE_RTP_VIDEO },
+
+  { FEATURE_OPTIONAL, NS_OLPC_BUDDY_PROPS "+notify" },
+  { FEATURE_OPTIONAL, NS_OLPC_ACTIVITIES "+notify" },
+  { FEATURE_OPTIONAL, NS_OLPC_CURRENT_ACTIVITY "+notify" },
+  { FEATURE_OPTIONAL, NS_OLPC_ACTIVITY_PROPS "+notify" },
+
+  { FEATURE_OPTIONAL, NS_GEOLOC "+notify" },
+
+  { 0, NULL }
 };
 
 static const Feature quirks[] = {
-      { 0, QUIRK_OMITS_CONTENT_CREATORS,
-        PRESENCE_CAP_JINGLE_OMITS_CONTENT_CREATOR },
-      { 0, NULL, 0 }
+      { 0, QUIRK_OMITS_CONTENT_CREATORS },
+      { 0, NULL }
 };
 
 static GabbleCapabilitySet *legacy_caps = NULL;
-- 
1.5.6.5