[next] telepathy-salut: Don't use TpDBusDaemon

[Simon McVittie]

Module: telepathy-salut
Branch: next
Commit: 4548221912fe7f600e1c88e7fa0eaa74d1052e23
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=4548221912fe7f600e1c88e7fa0eaa74d1052e23

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr  1 15:55:18 2014 +0100

Don't use TpDBusDaemon

---

 src/connection.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 5a6617e..169d11f 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2231,11 +2231,11 @@ connection_install_sidecar (
     const gchar *sidecar_iface)
 {
   SalutConnectionPrivate *priv = conn->priv;
-  TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon (
+  GDBusConnection *bus = tp_base_connection_get_dbus_connection (
       (TpBaseConnection *) conn);
   gchar *path = make_sidecar_path (conn, sidecar_iface);
 
-  tp_dbus_daemon_register_object (bus, path, G_OBJECT (sidecar));
+  tp_dbus_connection_register_object (bus, path, G_OBJECT (sidecar));
   g_hash_table_insert (priv->sidecars, g_strdup (sidecar_iface),
       g_object_ref (sidecar));
 
@@ -2436,7 +2436,7 @@ sidecars_conn_status_changed_cb (
     gpointer unused)
 {
   SalutConnectionPrivate *priv = conn->priv;
-  TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon (
+  GDBusConnection *bus = tp_base_connection_get_dbus_connection (
       (TpBaseConnection *) conn);
   GHashTableIter iter;
   gpointer key, value;
@@ -2448,7 +2448,7 @@ sidecars_conn_status_changed_cb (
       while (g_hash_table_iter_next (&iter, NULL, &value))
         {
           DEBUG ("removing %s from the bus", salut_sidecar_get_interface (value));
-          tp_dbus_daemon_unregister_object (bus, G_OBJECT (value));
+          tp_dbus_connection_unregister_object (bus, G_OBJECT (value));
         }
 
       g_hash_table_iter_init (&iter, priv->pending_sidecars);