[Telepathy-commits] [telepathy-glib/master] BaseConnection: Implement Requests GInterface

Will Thompson will.thompson at collabora.co.uk
Wed Sep 10 10:35:23 PDT 2008


It is not added to Connection.GetInterfaces; subclasses should do that
if they implement create_channel_managers
---
 telepathy-glib/base-connection.c |   11 +++++++----
 telepathy-glib/base-connection.h |    3 ---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 4f94789..49943db 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -57,6 +57,7 @@
 #include "debug-internal.h"
 
 static void service_iface_init (gpointer, gpointer);
+static void requests_iface_init (gpointer, gpointer);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnection,
     tp_base_connection,
@@ -64,7 +65,9 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnection,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION,
       service_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init));
+      tp_dbus_properties_mixin_iface_init);
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS,
+      requests_iface_init));
 
 enum
 {
@@ -2513,9 +2516,9 @@ conn_requests_ensure_channel (TpSvcConnectionInterfaceRequests *svc,
 #endif
 
 
-void
-tp_base_connection_requests_iface_init (gpointer g_iface,
-                                        gpointer iface_data G_GNUC_UNUSED)
+static void
+requests_iface_init (gpointer g_iface,
+                     gpointer iface_data G_GNUC_UNUSED)
 {
   TpSvcConnectionInterfaceRequestsClass *iface = g_iface;
 
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 9567630..96b246d 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -295,9 +295,6 @@ void tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
 
 void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *self);
 
-void tp_base_connection_requests_iface_init (gpointer g_iface,
-    gpointer iface_data);
-
 void tp_base_connection_register_requests_dbus_properties (GObjectClass *cls);
 
 /* TYPE MACROS */
-- 
1.5.6.5




More information about the Telepathy-commits mailing list