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

[Guillaume Desmottes]

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

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

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

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

---

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

diff --git a/tests/lib/simple-channel-dispatcher.c b/tests/lib/simple-channel-dispatcher.c
index 086b794..541ee81 100644
--- a/tests/lib/simple-channel-dispatcher.c
+++ b/tests/lib/simple-channel-dispatcher.c
@@ -364,15 +364,6 @@ tp_tests_simple_channel_dispatcher_class_init (
         { NULL }
   };
 
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-        { TP_IFACE_CHANNEL_DISPATCHER,
-          tp_dbus_properties_mixin_getter_gobject_properties,
-          NULL,
-          am_props
-        },
-        { NULL },
-  };
-
   g_type_class_add_private (klass, sizeof (TpTestsSimpleChannelDispatcherPrivate));
   object_class->get_property = tp_tests_simple_channel_dispatcher_get_property;
   object_class->set_property = tp_tests_simple_channel_dispatcher_set_property;
@@ -400,7 +391,8 @@ tp_tests_simple_channel_dispatcher_class_init (
       0, NULL, NULL, NULL,
       G_TYPE_NONE, 1, TP_TESTS_TYPE_SIMPLE_CHANNEL_REQUEST);
 
-  klass->dbus_props_class.interfaces = prop_interfaces;
-  tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (TpTestsSimpleChannelDispatcherClass, dbus_props_class));
+  tp_dbus_properties_mixin_class_init (object_class, 0);
+  tp_dbus_properties_mixin_implement_interface (object_class,
+        TP_IFACE_QUARK_CHANNEL_DISPATCHER,
+        tp_dbus_properties_mixin_getter_gobject_properties, NULL, am_props);
 }
diff --git a/tests/lib/simple-channel-dispatcher.h b/tests/lib/simple-channel-dispatcher.h
index ac23f10..9ddae32 100644
--- a/tests/lib/simple-channel-dispatcher.h
+++ b/tests/lib/simple-channel-dispatcher.h
@@ -23,7 +23,6 @@ typedef struct _TpTestsSimpleChannelDispatcherPrivate TpTestsSimpleChannelDispat
 
 struct _TpTestsSimpleChannelDispatcherClass {
     GObjectClass parent_class;
-    TpDBusPropertiesMixinClass dbus_props_class;
 };
 
 struct _TpTestsSimpleChannelDispatcher {