[next] telepathy-rakia: RakiaConnectionClass: remove TpDBusPropertiesMixinClass

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: 70862bf4b41ba7f10d9cd2d75dff642c0f449b2b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=70862bf4b41ba7f10d9cd2d75dff642c0f449b2b

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 14:39:43 2014 +0100

RakiaConnectionClass: remove TpDBusPropertiesMixinClass

It's in telepathy-glib-dbus.h now, and I'd rather avoid including that
in header files.

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

---

 src/sip-connection.c |   16 ++++------------
 src/sip-connection.h |    1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/sip-connection.c b/src/sip-connection.c
index 0da77ab..c8cd447 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -468,14 +468,6 @@ rakia_connection_class_init (RakiaConnectionClass *klass)
   TpBaseConnectionClass *base_class = TP_BASE_CONNECTION_CLASS (klass);
   RakiaBaseConnectionClass *sip_class = RAKIA_BASE_CONNECTION_CLASS (klass);
   GParamSpec *param_spec;
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
-          conn_aliasing_properties_getter,
-          NULL,
-          conn_aliasing_properties,
-        },
-        { NULL }
-  };
 
   /* Implement pure-virtual methods */
   sip_class->create_handle = rakia_connection_create_nua_handle;
@@ -500,8 +492,6 @@ rakia_connection_class_init (RakiaConnectionClass *klass)
   object_class->set_property = rakia_connection_set_property;
   object_class->get_property = rakia_connection_get_property;
 
-  klass->properties_class.interfaces = prop_interfaces;
-
 #define INST_PROP(x) \
   g_object_class_install_property (object_class,  x, param_spec)
 
@@ -632,8 +622,10 @@ rakia_connection_class_init (RakiaConnectionClass *klass)
 
 #undef INST_PROP
 
-  tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (RakiaConnectionClass, properties_class));
+  tp_dbus_properties_mixin_class_init (object_class, 0);
+  tp_dbus_properties_mixin_implement_interface (object_class,
+      TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING1,
+      conn_aliasing_properties_getter, NULL, conn_aliasing_properties);
 }
 
 typedef struct {
diff --git a/src/sip-connection.h b/src/sip-connection.h
index 1ebab77..30dcb0d 100644
--- a/src/sip-connection.h
+++ b/src/sip-connection.h
@@ -43,7 +43,6 @@ typedef struct _RakiaConnectionPrivate RakiaConnectionPrivate;
 
 struct _RakiaConnectionClass {
     RakiaBaseConnectionClass parent_class;
-    TpDBusPropertiesMixinClass properties_class;
 };
 
 struct _RakiaConnection {