[Telepathy-commits] [telepathy-glib/master] Update tp_message_mixin_init_dbus_properties() to use tp_dbus_properties_mixin_implement_interface()

[Simon McVittie]

20080530150218-53eee-f49b34d9f7e6f5580334bd659aadbbbdf2c89f2a.gz
---
 telepathy-glib/message-mixin.c |   12 +++++-------
 telepathy-glib/message-mixin.h |    3 +--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
index c0c1a2e..7144b8d 100644
--- a/telepathy-glib/message-mixin.c
+++ b/telepathy-glib/message-mixin.c
@@ -1541,7 +1541,7 @@ tp_message_mixin_send_message_async (TpSvcChannelInterfaceMessages *iface,
 
 /**
  * tp_message_mixin_init_dbus_properties:
- * @impl: An empty entry in a static array of #TpDBusPropertiesMixinIfaceImpl
+ * @cls: The class of an object with this mixin
  *
  * Set up a #TpDBusPropertiesMixinClass to use this mixin's implementation
  * of the Messages interface's properties.
@@ -1550,7 +1550,7 @@ tp_message_mixin_send_message_async (TpSvcChannelInterfaceMessages *iface,
  * and sets a list of the supported properties for it.
  */
 void
-tp_message_mixin_init_dbus_properties (TpDBusPropertiesMixinIfaceImpl *impl)
+tp_message_mixin_init_dbus_properties (GObjectClass *cls)
 {
   static TpDBusPropertiesMixinPropImpl props[] = {
       { "PendingMessages", NULL, NULL },
@@ -1559,11 +1559,9 @@ tp_message_mixin_init_dbus_properties (TpDBusPropertiesMixinIfaceImpl *impl)
       { NULL }
   };
 
-  memset (impl, '\0', sizeof (TpDBusPropertiesMixinIfaceImpl));
-  impl->name = TP_IFACE_CHANNEL_INTERFACE_MESSAGES;
-  impl->getter = tp_message_mixin_get_dbus_property;
-  impl->setter = NULL;
-  impl->props = props;
+  tp_dbus_properties_mixin_implement_interface (cls,
+      TP_IFACE_QUARK_CHANNEL_INTERFACE_MESSAGES,
+      tp_message_mixin_get_dbus_property, NULL, props);
 }
 
 
diff --git a/telepathy-glib/message-mixin.h b/telepathy-glib/message-mixin.h
index 21892ae..b13e09d 100644
--- a/telepathy-glib/message-mixin.h
+++ b/telepathy-glib/message-mixin.h
@@ -100,8 +100,7 @@ void tp_message_mixin_messages_iface_init (gpointer g_iface,
 
 void tp_message_mixin_init (GObject *obj, gsize offset,
     TpBaseConnection *connection);
-void tp_message_mixin_init_dbus_properties (
-    TpDBusPropertiesMixinIfaceImpl *impl);
+void tp_message_mixin_init_dbus_properties (GObjectClass *cls);
 void tp_message_mixin_finalize (GObject *obj);
 
 G_END_DECLS
-- 
1.5.6.5