diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-15 15:39:45 -0400 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-15 15:42:31 -0400 |
| commit | d8edca5135d6b9fdbec6d25441f61e1f01098f28 (patch) | |
| tree | 602bd195ca4b33565f2e1688421551d9c923b9bb /src/discovery-client.h | |
| parent | 386dd1256d47e949174a577d8046a88e9b5061a4 (diff) | |
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.
Diffstat (limited to 'src/discovery-client.h')
| -rw-r--r-- | src/discovery-client.h | 18 |
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); |