diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
commit | b81df5f0da5a86fe5bef05f3d8d627f6a01cee76 (patch) | |
tree | 540d8894da5b5d4f3a0513b68af1b59ec584f530 /src/discovery-client.c | |
parent | d8edca5135d6b9fdbec6d25441f61e1f01098f28 (diff) | |
download | telepathy-salut-b81df5f0da5a86fe5bef05f3d8d627f6a01cee76.tar.gz |
Revert to commit 822ddd0
Some commits intended for 'next' appear to have ended up on master.
Diffstat (limited to 'src/discovery-client.c')
-rw-r--r-- | src/discovery-client.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/discovery-client.c b/src/discovery-client.c index 75f48248..7add6fa8 100644 --- a/src/discovery-client.c +++ b/src/discovery-client.c @@ -65,6 +65,19 @@ 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, @@ -73,15 +86,17 @@ salut_discovery_client_create_self (SalutDiscoveryClient *self, const gchar *last_name, const gchar *jid, const gchar *email, - const gchar *published_name) + const gchar *published_name, + const GArray *olpc_key, + const gchar *olpc_color) { SalutSelf * (*virtual_method)(SalutDiscoveryClient *, SalutConnection *, const gchar *, const gchar *, const gchar *, const gchar *, - const gchar *, const gchar *) = + const gchar *, const gchar *, const GArray *, 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); + jid, email, published_name, olpc_key, olpc_color); } const gchar * |