summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-16 13:59:43 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-05-16 15:24:14 +0200
commite106c737fd132632e64ebc29e1baf36ad83620c4 (patch)
tree63eefde5dd4b1efc6b5c11058e45de0fb088b1ab
parentb67e69d0c047addeeea6b5597a010e4479588a1f (diff)
tls-certificate: use the 'invisible' TpDBusPropertiesMixin API
https://bugs.freedesktop.org/show_bug.cgi?id=78376
-rw-r--r--tests/lib/tls-certificate.c15
-rw-r--r--tests/lib/tls-certificate.h2
2 files changed, 4 insertions, 13 deletions
diff --git a/tests/lib/tls-certificate.c b/tests/lib/tls-certificate.c
index 48ceccc18..6f61199e2 100644
--- a/tests/lib/tls-certificate.c
+++ b/tests/lib/tls-certificate.c
@@ -185,14 +185,6 @@ tp_tests_tls_certificate_class_init (TpTestsTLSCertificateClass *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;
@@ -247,9 +239,10 @@ tp_tests_tls_certificate_class_init (TpTestsTLSCertificateClass *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 (TpTestsTLSCertificateClass, 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/tests/lib/tls-certificate.h b/tests/lib/tls-certificate.h
index 8549ca59a..1d113b17d 100644
--- a/tests/lib/tls-certificate.h
+++ b/tests/lib/tls-certificate.h
@@ -34,8 +34,6 @@ typedef struct _TpTestsTLSCertificatePrivate TpTestsTLSCertificatePrivate;
struct _TpTestsTLSCertificateClass {
GObjectClass parent_class;
-
- TpDBusPropertiesMixinClass dbus_props_class;
};
struct _TpTestsTLSCertificate {