remove OLPC interfaces

They have been broken when switching to next and are going to be removed in
Gabble as well. They should be redesigned properly.

1 files changed, 0 insertions, 23 deletions

diff --git a/src/capability-set.c b/src/capability-set.c
index f8632691..ffdb0f36 100644
--- a/src/capability-set.c
+++ b/src/capability-set.c
@@ -38,7 +38,6 @@ struct _Feature
   enum {
     FEATURE_FIXED,
     FEATURE_OPTIONAL,
-    FEATURE_OLPC
   } feature_type;
   gchar *ns;
 };
@@ -70,11 +69,6 @@ static const Feature self_advertised_features[] =
   { FEATURE_OPTIONAL, NS_JINGLE_RTP_AUDIO },
   { FEATURE_OPTIONAL, NS_JINGLE_RTP_VIDEO },
 
-  { FEATURE_OLPC, NS_OLPC_BUDDY_PROPS "+notify" },
-  { FEATURE_OLPC, NS_OLPC_ACTIVITIES "+notify" },
-  { FEATURE_OLPC, NS_OLPC_CURRENT_ACTIVITY "+notify" },
-  { FEATURE_OLPC, NS_OLPC_ACTIVITY_PROPS "+notify" },
-
   { FEATURE_OPTIONAL, NS_GEOLOC "+notify" },
 
   { 0, NULL }
@@ -97,7 +91,6 @@ static GabbleCapabilitySet *any_jingle_av_caps = NULL;
 static GabbleCapabilitySet *any_transport_caps = NULL;
 static GabbleCapabilitySet *fixed_caps = NULL;
 static GabbleCapabilitySet *geoloc_caps = NULL;
-static GabbleCapabilitySet *olpc_caps = NULL;
 
 const GabbleCapabilitySet *
 gabble_capabilities_get_legacy (void)
@@ -171,12 +164,6 @@ gabble_capabilities_get_geoloc_notify (void)
   return geoloc_caps;
 }
 
-const GabbleCapabilitySet *
-gabble_capabilities_get_olpc_notify (void)
-{
-  return olpc_caps;
-}
-
 static gboolean
 omits_content_creators (WockyNode *identity)
 {
@@ -292,14 +279,6 @@ gabble_capabilities_init (gpointer conn)
 
       geoloc_caps = gabble_capability_set_new ();
       gabble_capability_set_add (geoloc_caps, NS_GEOLOC "+notify");
-
-      olpc_caps = gabble_capability_set_new ();
-
-      for (feat = self_advertised_features; feat->ns != NULL; feat++)
-        {
-          if (feat->feature_type == FEATURE_OLPC)
-            gabble_capability_set_add (olpc_caps, feat->ns);
-        }
     }
 
   g_assert (feature_handles != NULL);
@@ -326,7 +305,6 @@ gabble_capabilities_finalize (gpointer conn)
       gabble_capability_set_free (any_transport_caps);
       gabble_capability_set_free (fixed_caps);
       gabble_capability_set_free (geoloc_caps);
-      gabble_capability_set_free (olpc_caps);
 
       legacy_caps = NULL;
       share_v1_caps = NULL;
@@ -340,7 +318,6 @@ gabble_capabilities_finalize (gpointer conn)
       any_transport_caps = NULL;
       fixed_caps = NULL;
       geoloc_caps = NULL;
-      olpc_caps = NULL;
 
       tp_clear_object (&feature_handles);
     }