[next] telepathy-glib: simple-channel-request: use the 'invisible' TpDBusPropertiesMixin API

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Fri May 16 06:28:33 PDT 2014


Module: telepathy-glib
Branch: next
Commit: d6ef4681216c40edc7c5574b423f1c5a759eeb85
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=d6ef4681216c40edc7c5574b423f1c5a759eeb85

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri May 16 13:59:43 2014 +0200

simple-channel-request: use the 'invisible' TpDBusPropertiesMixin API

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

---

 tests/lib/simple-channel-request.c |   16 ++++------------
 tests/lib/simple-channel-request.h |    1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/lib/simple-channel-request.c b/tests/lib/simple-channel-request.c
index 193ad2f..67a6cef 100644
--- a/tests/lib/simple-channel-request.c
+++ b/tests/lib/simple-channel-request.c
@@ -389,15 +389,6 @@ tp_tests_simple_channel_request_class_init (
         { NULL }
   };
 
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-        { TP_IFACE_CHANNEL_REQUEST,
-          tp_dbus_properties_mixin_getter_gobject_properties,
-          NULL,
-          am_props
-        },
-        { NULL },
-  };
-
   g_type_class_add_private (klass, sizeof (TpTestsSimpleChannelRequestPrivate));
   object_class->get_property = tp_tests_simple_channel_request_get_property;
   object_class->set_property = tp_tests_simple_channel_request_set_property;
@@ -454,9 +445,10 @@ tp_tests_simple_channel_request_class_init (
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_HINTS, param_spec);
 
-  klass->dbus_props_class.interfaces = prop_interfaces;
-  tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpTestsSimpleChannelRequestClass, dbus_props_class));
+  tp_dbus_properties_mixin_class_init (object_class, 0);
+  tp_dbus_properties_mixin_implement_interface (object_class,
+        TP_IFACE_QUARK_CHANNEL_REQUEST,
+        tp_dbus_properties_mixin_getter_gobject_properties, NULL, am_props);
 }
 
 TpTestsSimpleChannelRequest *
diff --git a/tests/lib/simple-channel-request.h b/tests/lib/simple-channel-request.h
index 6c53bdc..bcd08a2 100644
--- a/tests/lib/simple-channel-request.h
+++ b/tests/lib/simple-channel-request.h
@@ -26,7 +26,6 @@ typedef struct _TpTestsSimpleChannelRequestPrivate TpTestsSimpleChannelRequestPr
 
 struct _TpTestsSimpleChannelRequestClass {
     GObjectClass parent_class;
-    TpDBusPropertiesMixinClass dbus_props_class;
 };
 
 struct _TpTestsSimpleChannelRequest {



More information about the telepathy-commits mailing list