diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-05-16 14:41:54 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-05-16 15:28:57 +0200 |
| commit | b1f980db595c4f26a3b7ddb212e9078e2f1607e9 (patch) | |
| tree | aedc2db7120f981cf291e1558cb092c7ae710d8a | |
| parent | 08e2e111e1315ad94c0dbdc4eeadb8c49752c226 (diff) | |
tube-stream: use the 'invisible' TpDBusPropertiesMixin API
https://bugs.freedesktop.org/show_bug.cgi?id=78376
| -rw-r--r-- | src/tube-stream.c | 26 | ||||
| -rw-r--r-- | src/tube-stream.h | 2 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/tube-stream.c b/src/tube-stream.c index 590eb0389..176f5542e 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -1425,19 +1425,6 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class) { "State", "state", NULL }, { NULL } }; - static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = { - { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1, - tp_dbus_properties_mixin_getter_gobject_properties, - NULL, - stream_tube_props, - }, - { TP_IFACE_CHANNEL_INTERFACE_TUBE1, - tp_dbus_properties_mixin_getter_gobject_properties, - NULL, - tube_iface_props, - }, - { NULL } - }; GObjectClass *object_class = G_OBJECT_CLASS (gabble_tube_stream_class); TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (gabble_tube_stream_class); GParamSpec *param_spec; @@ -1566,9 +1553,16 @@ gabble_tube_stream_class_init (GabbleTubeStreamClass *gabble_tube_stream_class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - gabble_tube_stream_class->dbus_props_class.interfaces = prop_interfaces; - tp_dbus_properties_mixin_class_init (object_class, - G_STRUCT_OFFSET (GabbleTubeStreamClass, dbus_props_class)); + tp_dbus_properties_mixin_class_init (object_class, 0); + + tp_dbus_properties_mixin_implement_interface (object_class, + TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE1, + tp_dbus_properties_mixin_getter_gobject_properties, NULL, + stream_tube_props); + tp_dbus_properties_mixin_implement_interface (object_class, + TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE1, + tp_dbus_properties_mixin_getter_gobject_properties, NULL, + tube_iface_props); tp_external_group_mixin_init_dbus_properties (object_class); } diff --git a/src/tube-stream.h b/src/tube-stream.h index 7ccb35c78..ac36e3c86 100644 --- a/src/tube-stream.h +++ b/src/tube-stream.h @@ -37,8 +37,6 @@ typedef struct _GabbleTubeStreamClass GabbleTubeStreamClass; struct _GabbleTubeStreamClass { TpBaseChannelClass parent_class; - - TpDBusPropertiesMixinClass dbus_props_class; }; struct _GabbleTubeStream { |