[next] telepathy-idle: Remove TpDBusPropertiesMixinClass from IdleTLSCertificateClass

Simon McVittie smcv at kemper.freedesktop.org
Wed May 7 02:18:32 PDT 2014


Module: telepathy-idle
Branch: next
Commit: 4dba652639e81b1f471d73bc1224885e164a7651
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=4dba652639e81b1f471d73bc1224885e164a7651

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 15:41:11 2014 +0100

Remove TpDBusPropertiesMixinClass from IdleTLSCertificateClass

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

---

 src/tls-certificate.c |   16 +++++-----------
 src/tls-certificate.h |    2 --
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index 6973899..a8d28aa 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -185,14 +185,6 @@ idle_tls_certificate_class_init (IdleTLSCertificateClass *klass)
     { "CertificateChainData", "certificate-chain-data", NULL },
     { NULL }
   };
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-    { TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE,
-      tp_dbus_properties_mixin_getter_gobject_properties,
-      NULL,
-      object_props,
-    },
-    { NULL }
-  };
   GObjectClass *oclass = G_OBJECT_CLASS (klass);
   GParamSpec *pspec;
 
@@ -246,9 +238,11 @@ idle_tls_certificate_class_init (IdleTLSCertificateClass *klass)
       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (oclass, PROP_DBUS_CONNECTION, pspec);
 
-  klass->dbus_props_class.interfaces = prop_interfaces;
-  tp_dbus_properties_mixin_class_init (oclass,
-      G_STRUCT_OFFSET (IdleTLSCertificateClass, dbus_props_class));
+  tp_dbus_properties_mixin_class_init (oclass, 0);
+  tp_dbus_properties_mixin_implement_interface (oclass,
+      TP_IFACE_QUARK_AUTHENTICATION_TLS_CERTIFICATE,
+      tp_dbus_properties_mixin_getter_gobject_properties,
+      NULL, object_props);
 }
 
 static void
diff --git a/src/tls-certificate.h b/src/tls-certificate.h
index 52ea684..e664204 100644
--- a/src/tls-certificate.h
+++ b/src/tls-certificate.h
@@ -33,8 +33,6 @@ typedef struct _IdleTLSCertificatePrivate IdleTLSCertificatePrivate;
 
 struct _IdleTLSCertificateClass {
   GObjectClass parent_class;
-
-  TpDBusPropertiesMixinClass dbus_props_class;
 };
 
 struct _IdleTLSCertificate {



More information about the telepathy-commits mailing list