diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 15:56:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 15:56:49 +0100 |
| commit | 07fd04b53d6e83911ac0ef883e7f13abbfc23f5c (patch) | |
| tree | f367af76bfcd4aa1169a71fe6a6f4fece0822e9b | |
| parent | 0dc997bac6c45573c417e5cf2f62e65db54bb21f (diff) | |
Adapt for removal of TpDBusDaemon
| -rw-r--r-- | src/server-tls-channel.c | 4 | ||||
| -rw-r--r-- | src/tls-certificate.c | 21 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c index dfd049c..8f23e38 100644 --- a/src/server-tls-channel.c +++ b/src/server-tls-channel.c @@ -190,8 +190,8 @@ idle_server_tls_channel_constructed (GObject *object) "object-path", cert_object_path, "certificate-chain-data", certificates, "certificate-type", "x509", - "dbus-daemon", - tp_base_connection_get_dbus_daemon ( + "dbus-connection", + tp_base_connection_get_dbus_connection ( tp_base_channel_get_connection (TP_BASE_CHANNEL (self))), NULL); self->priv->server_cert_path = cert_object_path; diff --git a/src/tls-certificate.c b/src/tls-certificate.c index 17a3b50..0842af5 100644 --- a/src/tls-certificate.c +++ b/src/tls-certificate.c @@ -47,7 +47,7 @@ struct _IdleTLSCertificatePrivate { GPtrArray *rejections; GPtrArray *cert_data; - TpDBusDaemon *daemon; + GDBusConnection *dbus_connection; gboolean dispose_has_run; }; @@ -60,7 +60,7 @@ enum { PROP_CERTIFICATE_CHAIN_DATA, /* not exported */ - PROP_DBUS_DAEMON, + PROP_DBUS_CONNECTION, NUM_PROPERTIES }; @@ -115,8 +115,8 @@ idle_tls_certificate_set_property (GObject *object, case PROP_CERTIFICATE_CHAIN_DATA: self->priv->cert_data = g_value_dup_boxed (value); break; - case PROP_DBUS_DAEMON: - self->priv->daemon = g_value_dup_object (value); + case PROP_DBUS_CONNECTION: + self->priv->dbus_connection = g_value_dup_object (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, value); @@ -149,7 +149,7 @@ idle_tls_certificate_dispose (GObject *object) self->priv->dispose_has_run = TRUE; - tp_clear_object (&self->priv->daemon); + tp_clear_object (&self->priv->dbus_connection); G_OBJECT_CLASS (idle_tls_certificate_parent_class)->dispose (object); } @@ -165,7 +165,7 @@ idle_tls_certificate_constructed (GObject *object) chain_up (object); /* register the certificate on the bus */ - tp_dbus_daemon_register_object (self->priv->daemon, + tp_dbus_connection_register_object (self->priv->dbus_connection, self->priv->object_path, self); } @@ -242,12 +242,11 @@ idle_tls_certificate_class_init (IdleTLSCertificateClass *klass) G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (oclass, PROP_CERTIFICATE_CHAIN_DATA, pspec); - pspec = g_param_spec_object ("dbus-daemon", - "The DBus daemon connection", - "The connection to the DBus daemon owning the CM", - TP_TYPE_DBUS_DAEMON, + pspec = g_param_spec_object ("dbus-connection", "D-Bus connection", + "D-Bus connection", + G_TYPE_DBUS_CONNECTION, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (oclass, PROP_DBUS_DAEMON, pspec); + g_object_class_install_property (oclass, PROP_DBUS_CONNECTION, pspec); klass->dbus_props_class.interfaces = prop_interfaces; tp_dbus_properties_mixin_class_init (oclass, |