[next] telepathy-gabble: Stop using tp_dbus_properties_mixin_iface_init which has been removed

Simon McVittie smcv at kemper.freedesktop.org
Tue Apr 8 12:19:54 PDT 2014


Module: telepathy-gabble
Branch: next
Commit: 2ba53cc4e45765f44680c9577d45d139ed3ca645
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=2ba53cc4e45765f44680c9577d45d139ed3ca645

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Apr  7 19:47:36 2014 +0100

Stop using tp_dbus_properties_mixin_iface_init which has been removed

TpSvc* interfaces always (try to) use the D-Bus properties mixin now.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77144

---

 src/connection.c      |    2 --
 src/tls-certificate.c |    4 +---
 src/tube-stream.c     |    2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index dc5e232..ca48d4e 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -99,8 +99,6 @@ G_DEFINE_TYPE_WITH_CODE(GabbleConnection,
       conn_avatars_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO1,
       conn_contact_info_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-       tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
       tp_base_contact_list_mixin_list_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1,
diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index 9b5a208..6fe482d 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -34,9 +34,7 @@ G_DEFINE_TYPE_WITH_CODE (GabbleTLSCertificate,
     gabble_tls_certificate,
     G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE,
-        tls_certificate_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-        tp_dbus_properties_mixin_iface_init);)
+        tls_certificate_iface_init))
 
 struct _GabbleTLSCertificatePrivate {
   gchar *object_path;
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 14adbda..590eb03 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -64,8 +64,6 @@ static void streamtube_iface_init (gpointer g_iface, gpointer iface_data);
 
 G_DEFINE_TYPE_WITH_CODE (GabbleTubeStream, gabble_tube_stream,
     TP_TYPE_BASE_CHANNEL,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_TUBE_IFACE, tube_iface_init);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE1,
       streamtube_iface_init);



More information about the telepathy-commits mailing list