[Pkg-telepathy-commits] [telepathy-glib-1] 184/212: Use the "invisible TpDBusPropertiesMixin" in all public classes
Simon McVittie
smcv at debian.org
Wed May 14 12:09:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib-1.
commit 7a3c11f0f539dabf6dae303bcd51e3c6b7335dc4
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Wed Apr 16 15:40:39 2014 +0100
Use the "invisible TpDBusPropertiesMixin" in all public classes
Reviewed-by: Xavier Claessens <xavier.claessens at collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189
---
telepathy-glib/base-call-content.c | 24 +++++---------
telepathy-glib/base-call-content.h | 2 --
telepathy-glib/base-call-stream.c | 15 +++------
telepathy-glib/base-call-stream.h | 2 --
telepathy-glib/base-channel.c | 19 ++++-------
telepathy-glib/base-channel.h | 2 --
telepathy-glib/base-client.c | 27 ++++++++--------
telepathy-glib/base-client.h | 1 -
telepathy-glib/base-password-channel.c | 28 ++++++----------
telepathy-glib/base-password-channel.h | 6 ++--
telepathy-glib/base-protocol.c | 28 ++++++++--------
telepathy-glib/base-protocol.h | 1 -
telepathy-glib/call-content-media-description.c | 43 ++++++++++---------------
telepathy-glib/call-content-media-description.h | 1 -
telepathy-glib/call-stream-endpoint.c | 16 +++------
telepathy-glib/call-stream-endpoint.h | 2 +-
telepathy-glib/debug-sender.c | 17 ++++------
telepathy-glib/debug-sender.h | 1 -
18 files changed, 87 insertions(+), 148 deletions(-)
diff --git a/telepathy-glib/base-call-content.c b/telepathy-glib/base-call-content.c
index c73a7f8..87ceefd 100644
--- a/telepathy-glib/base-call-content.c
+++ b/telepathy-glib/base-call-content.c
@@ -381,19 +381,6 @@ tp_base_call_content_class_init (TpBaseCallContentClass *klass)
{ "DeferredTones", "deferred-tones", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CALL1_CONTENT,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- content_props,
- },
- { TP_IFACE_CALL1_CONTENT_INTERFACE_DTMF1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- content_dtmf_props,
- },
- { NULL }
- };
g_type_class_add_private (klass, sizeof (TpBaseCallContentPrivate));
@@ -541,9 +528,14 @@ tp_base_call_content_class_init (TpBaseCallContentClass *klass)
g_object_class_install_property (object_class, PROP_DEFERRED_TONES,
param_spec);
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBaseCallContentClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL, content_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT_INTERFACE_DTMF1,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ content_dtmf_props);
}
/**
diff --git a/telepathy-glib/base-call-content.h b/telepathy-glib/base-call-content.h
index 07b0105..f2e3813 100644
--- a/telepathy-glib/base-call-content.h
+++ b/telepathy-glib/base-call-content.h
@@ -56,8 +56,6 @@ struct _TpBaseCallContentClass {
/*<private>*/
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
-
/*< public >*/
TpBaseCallContentDeinitFunc deinit;
TpBaseCallContentGetInterfacesFunc get_interfaces;
diff --git a/telepathy-glib/base-call-stream.c b/telepathy-glib/base-call-stream.c
index 25e1873..c66602a 100644
--- a/telepathy-glib/base-call-stream.c
+++ b/telepathy-glib/base-call-stream.c
@@ -316,14 +316,6 @@ tp_base_call_stream_class_init (TpBaseCallStreamClass *klass)
{ "CanRequestReceiving", "can-request-receiving", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CALL1_STREAM,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- stream_props,
- },
- { NULL }
- };
g_type_class_add_private (klass, sizeof (TpBaseCallStreamPrivate));
@@ -461,9 +453,10 @@ tp_base_call_stream_class_init (TpBaseCallStreamClass *klass)
g_object_class_install_property (object_class, PROP_CAN_REQUEST_RECEIVING,
param_spec);
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBaseCallStreamClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_STREAM,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL, stream_props);
}
/**
diff --git a/telepathy-glib/base-call-stream.h b/telepathy-glib/base-call-stream.h
index 269e69a..6bcd054 100644
--- a/telepathy-glib/base-call-stream.h
+++ b/telepathy-glib/base-call-stream.h
@@ -53,8 +53,6 @@ struct _TpBaseCallStreamClass {
/*<private>*/
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
-
/*< public >*/
TpBaseCallStreamRequestReceivingFunc request_receiving;
TpBaseCallStreamSetSendingFunc set_sending;
diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel.c
index e65a070..bd7960a 100644
--- a/telepathy-glib/base-channel.c
+++ b/telepathy-glib/base-channel.c
@@ -122,7 +122,6 @@
/**
* TpBaseChannelClass:
- * @dbus_props_class: The class structure for the DBus properties mixin
* @channel_type: The type of channel that instances of this class represent
* (e.g. #TP_IFACE_CHANNEL_TYPE_TEXT)
* @target_entity_type: The type of handle that is the target of channels of
@@ -988,14 +987,6 @@ tp_base_channel_class_init (TpBaseChannelClass *tp_base_channel_class)
{ "InitiatorID", "initiator-id", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CHANNEL,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- channel_props,
- },
- { NULL }
- };
GObjectClass *object_class = G_OBJECT_CLASS (tp_base_channel_class);
GParamSpec *param_spec;
@@ -1179,9 +1170,13 @@ tp_base_channel_class_init (TpBaseChannelClass *tp_base_channel_class)
g_object_class_install_property (object_class, PROP_INITIATOR_ID,
param_spec);
- tp_base_channel_class->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBaseChannelClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CHANNEL,
+ tp_dbus_properties_mixin_getter_gobject_properties,
+ NULL,
+ channel_props);
+
tp_base_channel_class->fill_immutable_properties =
tp_base_channel_fill_basic_immutable_properties;
tp_base_channel_class->get_object_path_suffix =
diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h
index 01fb132..86d04f4 100644
--- a/telepathy-glib/base-channel.h
+++ b/telepathy-glib/base-channel.h
@@ -56,8 +56,6 @@ struct _TpBaseChannelClass
GObjectClass parent_class;
/*< public >*/
- TpDBusPropertiesMixinClass dbus_props_class;
-
const gchar *channel_type;
TpEntityType target_entity_type;
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index ded33b0..a32b474 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -1359,17 +1359,6 @@ tp_base_client_class_init (TpBaseClientClass *cls)
GINT_TO_POINTER (DP_OBSERVER_DELAY_APPROVERS) },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_ifaces[] = {
- { TP_IFACE_CLIENT, tp_base_client_get_dbus_properties, NULL,
- client_properties },
- { TP_IFACE_CLIENT_OBSERVER, tp_base_client_get_dbus_properties, NULL,
- observer_properties },
- { TP_IFACE_CLIENT_APPROVER, tp_base_client_get_dbus_properties, NULL,
- approver_properties },
- { TP_IFACE_CLIENT_HANDLER, tp_base_client_get_dbus_properties, NULL,
- handler_properties },
- { NULL }
- };
GObjectClass *object_class = G_OBJECT_CLASS (cls);
g_type_class_add_private (cls, sizeof (TpBaseClientPrivate));
@@ -1490,9 +1479,19 @@ tp_base_client_class_init (TpBaseClientClass *cls)
G_TYPE_NONE, 3,
TP_TYPE_CHANNEL_REQUEST, G_TYPE_STRING, G_TYPE_STRING);
- cls->dbus_properties_class.interfaces = prop_ifaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBaseClientClass, dbus_properties_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CLIENT, tp_base_client_get_dbus_properties,
+ NULL, client_properties);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CLIENT_OBSERVER, tp_base_client_get_dbus_properties,
+ NULL, observer_properties);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CLIENT_APPROVER, tp_base_client_get_dbus_properties,
+ NULL, approver_properties);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CLIENT_HANDLER, tp_base_client_get_dbus_properties,
+ NULL, handler_properties);
}
static GList *
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index a2c03d6..752bd10 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -83,7 +83,6 @@ struct _TpBaseClientClass {
TpBaseClientClassHandleChannelImpl handle_channel;
/*<private>*/
GCallback _padding[4];
- TpDBusPropertiesMixinClass dbus_properties_class;
TpBaseClientClassPrivate *priv;
};
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index 130ec73..d2739f3 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -307,21 +307,6 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
{ "MaySaveResponse", GUINT_TO_POINTER (DBUSPROP_MAY_SAVE_RESPONSE) },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
- /* this only has one property so we recycle the getter function from
- * the SASL interface */
- tp_base_password_channel_get_sasl_property,
- NULL,
- server_base_password_props,
- },
- { TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
- tp_base_password_channel_get_sasl_property,
- NULL,
- sasl_auth_props,
- },
- { NULL }
- };
GObjectClass *object_class = G_OBJECT_CLASS (tp_base_password_channel_class);
GParamSpec *param_spec;
@@ -371,9 +356,16 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
G_TYPE_NONE, 4,
G_TYPE_GSTRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING);
- tp_base_password_channel_class->properties_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBasePasswordChannelClass, properties_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION1,
+ /* this only has one property so we recycle the getter function from
+ * the SASL interface */
+ tp_base_password_channel_get_sasl_property, NULL,
+ server_base_password_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION1,
+ tp_base_password_channel_get_sasl_property, NULL, sasl_auth_props);
}
static void
diff --git a/telepathy-glib/base-password-channel.h b/telepathy-glib/base-password-channel.h
index d71ca8b..2aa7439 100644
--- a/telepathy-glib/base-password-channel.h
+++ b/telepathy-glib/base-password-channel.h
@@ -37,15 +37,15 @@ typedef struct _TpBasePasswordChannelClass TpBasePasswordChannelClass;
struct _TpBasePasswordChannelClass
{
+ /*<private>*/
TpBaseChannelClass parent_class;
-
- TpDBusPropertiesMixinClass properties_class;
+ GCallback _padding[4];
};
struct _TpBasePasswordChannel
{
+ /*<private>*/
TpBaseChannel parent;
-
TpBasePasswordChannelPrivate *priv;
};
diff --git a/telepathy-glib/base-protocol.c b/telepathy-glib/base-protocol.c
index 9ddd2f6..99f2f3d 100644
--- a/telepathy-glib/base-protocol.c
+++ b/telepathy-glib/base-protocol.c
@@ -492,7 +492,6 @@ tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec,
/**
* TpBaseProtocolClass:
* @parent_class: the parent class
- * @dbus_properties_class: a D-Bus properties mixin
* @is_stub: if %TRUE, this protocol will not be advertised on D-Bus (for
* internal use by #TpBaseConnection)
* @get_parameters: a callback used to implement
@@ -1163,17 +1162,6 @@ tp_base_protocol_class_init (TpBaseProtocolClass *klass)
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_PROTOCOL, protocol_properties_getter, NULL, channel_props },
- { TP_IFACE_PROTOCOL_INTERFACE_PRESENCE1, protocol_prop_presence_getter,
- NULL, presence_props },
- { TP_IFACE_PROTOCOL_INTERFACE_AVATARS1, protocol_prop_avatar_getter,
- NULL, avatar_props },
- { TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1,
- protocol_prop_addressing_getter, NULL, addressing_props },
- { NULL }
- };
-
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (TpBaseProtocolPrivate));
@@ -1218,9 +1206,19 @@ tp_base_protocol_class_init (TpBaseProtocolClass *klass)
TP_HASH_TYPE_QUALIFIED_PROPERTY_VALUE_MAP,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- klass->dbus_properties_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpBaseProtocolClass, dbus_properties_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_PROTOCOL, protocol_properties_getter, NULL,
+ channel_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE1,
+ protocol_prop_presence_getter, NULL, presence_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS1, protocol_prop_avatar_getter,
+ NULL, avatar_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING1,
+ protocol_prop_addressing_getter, NULL, addressing_props);
}
static void
diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h
index 0c11031..193d797 100644
--- a/telepathy-glib/base-protocol.h
+++ b/telepathy-glib/base-protocol.h
@@ -141,7 +141,6 @@ typedef void (*TpBaseProtocolGetAvatarDetailsFunc) (TpBaseProtocol *self,
struct _TpBaseProtocolClass
{
GDBusObjectSkeletonClass parent_class;
- TpDBusPropertiesMixinClass dbus_properties_class;
gboolean is_stub;
const TpCMParamSpec *(*get_parameters) (TpBaseProtocol *self);
diff --git a/telepathy-glib/call-content-media-description.c b/telepathy-glib/call-content-media-description.c
index 8ead34a..4c3c4d1 100644
--- a/telepathy-glib/call-content-media-description.c
+++ b/telepathy-glib/call-content-media-description.c
@@ -334,29 +334,6 @@ tp_call_content_media_description_class_init (
{ "EnableMetrics", "enable-metrics", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- media_description_props,
- },
- { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- rtp_header_extensions_props,
- },
- { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- rtcp_feedback_props,
- },
- { TP_IFACE_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- rtcp_extended_reports_props,
- },
- { NULL }
- };
g_type_class_add_private (klass, sizeof (TpCallContentMediaDescriptionPrivate));
@@ -640,9 +617,23 @@ tp_call_content_media_description_class_init (
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_ENABLE_METRICS, spec);
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpCallContentMediaDescriptionClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ media_description_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS1,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ rtp_header_extensions_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK1,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ rtcp_feedback_props);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS1,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ rtcp_extended_reports_props);
}
/**
diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h
index 276b3c4..85e673e 100644
--- a/telepathy-glib/call-content-media-description.h
+++ b/telepathy-glib/call-content-media-description.h
@@ -47,7 +47,6 @@ struct _TpCallContentMediaDescriptionClass {
/*<private>*/
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
gpointer future[4];
};
diff --git a/telepathy-glib/call-stream-endpoint.c b/telepathy-glib/call-stream-endpoint.c
index b896c47..e8e1410 100644
--- a/telepathy-glib/call-stream-endpoint.c
+++ b/telepathy-glib/call-stream-endpoint.c
@@ -277,14 +277,6 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
{ "IsICELite", "is-ice-lite", NULL },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_CALL1_STREAM_ENDPOINT,
- tp_dbus_properties_mixin_getter_gobject_properties,
- NULL,
- endpoint_props,
- },
- { NULL }
- };
g_type_class_add_private (klass, sizeof (TpCallStreamEndpointPrivate));
@@ -427,9 +419,11 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_IS_ICE_LITE, param_spec);
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpCallStreamEndpointClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_CALL1_STREAM_ENDPOINT,
+ tp_dbus_properties_mixin_getter_gobject_properties, NULL,
+ endpoint_props);
/**
* TpCallStreamEndpoint::candidate-selected:
diff --git a/telepathy-glib/call-stream-endpoint.h b/telepathy-glib/call-stream-endpoint.h
index 2741e27..556b51e 100644
--- a/telepathy-glib/call-stream-endpoint.h
+++ b/telepathy-glib/call-stream-endpoint.h
@@ -43,7 +43,7 @@ struct _TpCallStreamEndpointClass {
/*<private>*/
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
+ GCallback _padding[4];
};
struct _TpCallStreamEndpoint {
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index c5b190a..14dc2c7 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -253,14 +253,6 @@ tp_debug_sender_class_init (TpDebugSenderClass *klass)
{ "Enabled", "enabled", "enabled" },
{ NULL }
};
- static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
- { TP_IFACE_DEBUG1,
- tp_dbus_properties_mixin_getter_gobject_properties,
- tp_dbus_properties_mixin_setter_gobject_properties,
- debug_props,
- },
- { NULL }
- };
g_type_class_add_private (klass, sizeof (TpDebugSenderPrivate));
@@ -283,9 +275,12 @@ tp_debug_sender_class_init (TpDebugSenderClass *klass)
FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- klass->dbus_props_class.interfaces = prop_interfaces;
- tp_dbus_properties_mixin_class_init (object_class,
- G_STRUCT_OFFSET (TpDebugSenderClass, dbus_props_class));
+ tp_dbus_properties_mixin_class_init (object_class, 0);
+ tp_dbus_properties_mixin_implement_interface (object_class,
+ TP_IFACE_QUARK_DEBUG1,
+ tp_dbus_properties_mixin_getter_gobject_properties,
+ tp_dbus_properties_mixin_setter_gobject_properties,
+ debug_props);
}
static void
diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h
index f18fd38..c6f0cbc 100644
--- a/telepathy-glib/debug-sender.h
+++ b/telepathy-glib/debug-sender.h
@@ -58,7 +58,6 @@ struct _TpDebugSender {
struct _TpDebugSenderClass {
/*<private>*/
GObjectClass parent_class;
- TpDBusPropertiesMixinClass dbus_props_class;
GCallback _padding[7];
gpointer priv;
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git
More information about the Pkg-telepathy-commits
mailing list