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, 2 insertions, 16 deletions

diff --git a/src/discovery-client.h b/src/discovery-client.h
index e741a275..60bfd63d 100644
--- a/src/discovery-client.h
+++ b/src/discovery-client.h
@@ -26,9 +26,6 @@
 #include "contact-manager.h"
 #include "roomlist-manager.h"
 #include "self.h"
-#ifdef ENABLE_OLPC
-#include "olpc-activity-manager.h"
-#endif
 
 G_BEGIN_DECLS
 
@@ -55,14 +52,9 @@ struct _SalutDiscoveryClientClass
       SalutConnection *connection);
   SalutContactManager * (*create_contact_manager) (SalutDiscoveryClient *clt,
       SalutConnection *connection);
-#ifdef ENABLE_OLPC
-  SalutOlpcActivityManager * (*create_olpc_activity_manager) (
-      SalutDiscoveryClient *clt, SalutConnection *connection);
-#endif
   SalutSelf * (*create_self) (SalutDiscoveryClient *clt, SalutConnection *conn,
       const gchar *nickname, const gchar *first_name, const gchar *last_name,
-      const gchar *jid, const gchar *email, const gchar *published_name,
-      const GArray *olpc_key, const gchar *olpc_color);
+      const gchar *jid, const gchar *email, const gchar *published_name);
 
   const gchar * (*get_host_name_fqdn) (SalutDiscoveryClient *clt);
 };
@@ -93,16 +85,10 @@ SalutRoomlistManager * salut_discovery_client_create_roomlist_manager (
 SalutContactManager * salut_discovery_client_create_contact_manager (
     SalutDiscoveryClient *clt, SalutConnection *connection);
 
-#ifdef ENABLE_OLPC
-SalutOlpcActivityManager * salut_discovery_client_create_olpc_activity_manager (
-    SalutDiscoveryClient *clt, SalutConnection *connection);
-#endif
-
 SalutSelf * salut_discovery_client_create_self (
     SalutDiscoveryClient *clt, SalutConnection *connection,
     const gchar *nickname, const gchar *first_name, const gchar *last_name,
-    const gchar *jid, const gchar *email, const gchar *published_name,
-    const GArray *olpc_key, const gchar *olpc_color);
+    const gchar *jid, const gchar *email, const gchar *published_name);
 
 const gchar * salut_discovery_client_get_host_name_fqdn (
     SalutDiscoveryClient *clt);