diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2014-03-31 07:10:31 -0400 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-01 14:44:53 +0100 |
| commit | 48d8288c23f42098d7ce442d99dc8eee89ae4f98 (patch) | |
| tree | c92b2f306b63381a0cd5c1f090198805b274fbaa /telepathy-glib/base-connection.c | |
| parent | 557f0efd64c4af7167802ff95b3b8f3d3948012f (diff) | |
Rename remaining tp_dbus_daemon_*() to tp_dbus_connection_*()
Also moves their code to dbus.c/h module since their are only
GDBusConnection helpers now, not methods on TpDBusDaemon object.
Diffstat (limited to 'telepathy-glib/base-connection.c')
| -rw-r--r-- | telepathy-glib/base-connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c index 8119df045..eabe3fd43 100644 --- a/telepathy-glib/base-connection.c +++ b/telepathy-glib/base-connection.c @@ -479,10 +479,10 @@ tp_base_connection_unregister (TpBaseConnection *self) if (priv->been_registered) { - tp_dbus_daemon_unregister_object (priv->dbus_connection, self); + tp_dbus_connection_unregister_object (priv->dbus_connection, self); if (priv->bus_name != NULL) - tp_dbus_daemon_release_name (priv->dbus_connection, priv->bus_name, + tp_dbus_connection_release_name (priv->dbus_connection, priv->bus_name, NULL); else DEBUG ("not releasing bus name: nothing to release"); @@ -1394,9 +1394,9 @@ tp_base_connection_register (TpBaseConnection *self, g_free (safe_proto); g_free (unique_name); - if (!tp_dbus_daemon_try_register_object (priv->dbus_connection, priv->object_path, + if (!tp_dbus_connection_try_register_object (priv->dbus_connection, priv->object_path, self, error) || - !tp_dbus_daemon_request_name (priv->dbus_connection, priv->bus_name, FALSE, + !tp_dbus_connection_request_name (priv->dbus_connection, priv->bus_name, FALSE, error)) { g_free (priv->bus_name); |