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, 3 insertions, 18 deletions

diff --git a/src/discovery-client.c b/src/discovery-client.c
index 7add6fa8..75f48248 100644
--- a/src/discovery-client.c
+++ b/src/discovery-client.c
@@ -65,19 +65,6 @@ salut_discovery_client_create_contact_manager (SalutDiscoveryClient *self,
   return virtual_method (self, connection);
 }
 
-#ifdef ENABLE_OLPC
-SalutOlpcActivityManager *
-salut_discovery_client_create_olpc_activity_manager (SalutDiscoveryClient *self,
-                                                     SalutConnection *connection)
-{
-  SalutOlpcActivityManager * (*virtual_method)(SalutDiscoveryClient *,
-    SalutConnection *) =
-    SALUT_DISCOVERY_CLIENT_GET_CLASS (self)->create_olpc_activity_manager;
-  g_assert (virtual_method != NULL);
-  return virtual_method (self, connection);
-}
-#endif
-
 SalutSelf *
 salut_discovery_client_create_self (SalutDiscoveryClient *self,
                                     SalutConnection *connection,
@@ -86,17 +73,15 @@ salut_discovery_client_create_self (SalutDiscoveryClient *self,
                                     const gchar *last_name,
                                     const gchar *jid,
                                     const gchar *email,
-                                    const gchar *published_name,
-                                    const GArray *olpc_key,
-                                    const gchar *olpc_color)
+                                    const gchar *published_name)
 {
   SalutSelf * (*virtual_method)(SalutDiscoveryClient *, SalutConnection *,
       const gchar *, const gchar *, const gchar *, const gchar *,
-      const gchar *, const gchar *, const GArray *, const gchar *) =
+      const gchar *, const gchar *) =
     SALUT_DISCOVERY_CLIENT_GET_CLASS (self)->create_self;
   g_assert (virtual_method != NULL);
   return virtual_method (self, connection, nickname, first_name, last_name,
-      jid, email, published_name, olpc_key, olpc_color);
+      jid, email, published_name);
 }
 
 const gchar *