diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-05-16 13:59:43 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-05-16 15:24:14 +0200 |
| commit | 76735b28837045336b71ed15ae0bdf56c7cd1b3b (patch) | |
| tree | 40c8991bdfe381251a2d897b41e64b04e3a567e0 | |
| parent | e106c737fd132632e64ebc29e1baf36ad83620c4 (diff) | |
contactlist/conn: use the 'invisible' TpDBusPropertiesMixin API
https://bugs.freedesktop.org/show_bug.cgi?id=78376
| -rw-r--r-- | examples/cm/contactlist/conn.c | 15 | ||||
| -rw-r--r-- | examples/cm/contactlist/conn.h | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c index 20db31f90..d651c123a 100644 --- a/examples/cm/contactlist/conn.c +++ b/examples/cm/contactlist/conn.c @@ -413,14 +413,6 @@ example_contact_list_connection_class_init ( { "AliasFlags", GUINT_TO_POINTER (ALIASING_DP_ALIAS_FLAGS), NULL }, { NULL } }; - static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = { - { TP_IFACE_CONNECTION_INTERFACE_ALIASING1, - aliasing_get_dbus_property, - NULL, - aliasing_props, - }, - { NULL } - }; object_class->get_property = get_property; object_class->set_property = set_property; @@ -449,9 +441,10 @@ example_contact_list_connection_class_init ( g_object_class_install_property (object_class, PROP_SIMULATION_DELAY, param_spec); - klass->properties_mixin.interfaces = prop_interfaces; - tp_dbus_properties_mixin_class_init (object_class, - G_STRUCT_OFFSET (ExampleContactListConnectionClass, properties_mixin)); + tp_dbus_properties_mixin_class_init (object_class, 0); + tp_dbus_properties_mixin_implement_interface (object_class, + TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1, + aliasing_get_dbus_property, NULL, aliasing_props); } static void diff --git a/examples/cm/contactlist/conn.h b/examples/cm/contactlist/conn.h index 69c2bba6c..c540c3cb6 100644 --- a/examples/cm/contactlist/conn.h +++ b/examples/cm/contactlist/conn.h @@ -26,7 +26,6 @@ typedef struct _ExampleContactListConnectionPrivate struct _ExampleContactListConnectionClass { TpBaseConnectionClass parent_class; - TpDBusPropertiesMixinClass properties_mixin; }; struct _ExampleContactListConnection { |