diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-01 11:19:47 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 12:14:36 +0000 |
| commit | fe9f456a4b5dd457ca19a986bbcbac5acad360b2 (patch) | |
| tree | 74d9bfd17ad6a7f94fb7e119202946f9fd3b7e30 /src | |
| parent | 6b005f6cc8373fbc60deb853e38c0c5452cf8d57 (diff) | |
Use telepathy-glib for Sidecars1
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26609
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/conn-sidecars.c | 14 | ||||
| -rw-r--r-- | src/conn-sidecars.h | 2 | ||||
| -rw-r--r-- | src/connection.c | 6 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/conn-sidecars.c b/src/conn-sidecars.c index d2dd57eca..87407a485 100644 --- a/src/conn-sidecars.c +++ b/src/conn-sidecars.c @@ -178,7 +178,7 @@ create_sidecar_cb ( GList *l; for (l = contexts; l != NULL; l = l->next) - gabble_svc_connection_future_return_from_ensure_sidecar (l->data, + tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (l->data, path, props); g_hash_table_unref (props); @@ -200,7 +200,7 @@ out: static void gabble_connection_ensure_sidecar ( - GabbleSvcConnectionFUTURE *iface, + TpSvcConnectionInterfaceSidecars1 *iface, const gchar *sidecar_iface, DBusGMethodInvocation *context) { @@ -238,7 +238,7 @@ gabble_connection_ensure_sidecar ( GHashTable *props = gabble_sidecar_get_immutable_properties (sidecar); DEBUG ("sidecar %s already exists at %s", sidecar_iface, path); - gabble_svc_connection_future_return_from_ensure_sidecar (context, path, + tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (context, path, props); g_free (path); @@ -340,14 +340,12 @@ sidecars_conn_status_changed_cb ( } void -conn_future_iface_init ( - gpointer g_iface, - gpointer iface_data) +conn_sidecars_iface_init (gpointer g_iface) { - GabbleSvcConnectionFUTUREClass *klass = g_iface; + TpSvcConnectionInterfaceSidecars1Class *klass = g_iface; #define IMPLEMENT(x) \ - gabble_svc_connection_future_implement_##x (\ + tp_svc_connection_interface_sidecars1_implement_##x (\ klass, gabble_connection_##x) IMPLEMENT (ensure_sidecar); #undef IMPLEMENT diff --git a/src/conn-sidecars.h b/src/conn-sidecars.h index 46e076c08..a2459a876 100644 --- a/src/conn-sidecars.h +++ b/src/conn-sidecars.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS void conn_sidecars_init (GabbleConnection *conn); void conn_sidecars_dispose (GabbleConnection *conn); -void conn_future_iface_init (gpointer g_iface, gpointer iface_data); +void conn_sidecars_iface_init (gpointer g_iface); G_END_DECLS diff --git a/src/connection.c b/src/connection.c index 4f1078b85..598e57171 100644 --- a/src/connection.c +++ b/src/connection.c @@ -125,8 +125,8 @@ G_DEFINE_TYPE_WITH_CODE(GabbleConnection, G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, gabble_conn_contact_caps_iface_init); - G_IMPLEMENT_INTERFACE (GABBLE_TYPE_SVC_CONNECTION_FUTURE, - conn_future_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_SIDECARS1, + conn_sidecars_iface_init); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION, conn_mail_notif_iface_init); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES, @@ -883,7 +883,7 @@ static const gchar *implemented_interfaces[] = { TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES, TP_IFACE_CONNECTION_INTERFACE_LOCATION, GABBLE_IFACE_CONNECTION_INTERFACE_GABBLE_DECLOAK, - GABBLE_IFACE_CONNECTION_FUTURE, + TP_IFACE_CONNECTION_INTERFACE_SIDECARS1, TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES, TP_IFACE_CONNECTION_INTERFACE_ADDRESSING, NULL |