From 3753571a0bb81209ceb0b14c23ccfc1686893c9a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 21 Oct 2013 17:14:25 +0100 Subject: [PATCH 08/16] TpBaseConnection: implement properties via TpExportable::call-method --- telepathy-glib/base-connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c index fc209c5..c51267e 100644 --- a/telepathy-glib/base-connection.c +++ b/telepathy-glib/base-connection.c @@ -278,8 +278,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE(TpBaseConnection, G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE, NULL); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION, conn_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, - tp_dbus_properties_mixin_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, NULL); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS, requests_iface_init)) @@ -1735,7 +1734,6 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass) NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); - tp_dbus_properties_mixin_class_init (object_class, 0); tp_dbus_properties_mixin_implement_interface (object_class, TP_IFACE_QUARK_CONNECTION, tp_dbus_properties_mixin_getter_gobject_properties, NULL, @@ -1766,6 +1764,8 @@ tp_base_connection_init (TpBaseConnection *self) (GDestroyNotify) g_hash_table_unref); priv->interested_clients = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + tp_dbus_properties_mixin_init (self); } static gchar * -- 1.8.4.rc3