summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-04-07 19:47:36 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-04-08 20:14:03 +0100
commit2ba53cc4e45765f44680c9577d45d139ed3ca645 (patch)
tree65f8a704c854438ce468cd2442e34ba3f88bd0d0
parent5c7aac9a7b239fcaef5f0c131bb2d24cefb2c287 (diff)
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
-rw-r--r--src/connection.c2
-rw-r--r--src/tls-certificate.c4
-rw-r--r--src/tube-stream.c2
3 files changed, 1 insertions, 7 deletions
diff --git a/src/connection.c b/src/connection.c
index dc5e232a8..ca48d4ef8 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 9b5a208b5..6fe482d79 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 14adbda2c..590eb0389 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);