fd.o #31665: use TpDBusDaemon, not tp_get_bus()

Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index bab0e96e..3e7c8789 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -904,7 +904,8 @@ salut_tube_dbus_constructor (GType type,
   GObject *obj;
   SalutTubeDBus *self;
   SalutTubeDBusPrivate *priv;
-  DBusGConnection *bus;
+  TpDBusDaemon *bus;
+  TpBaseConnection *base_conn;
   TpHandleRepoIface *contact_repo;
   TpHandleRepoIface *handles_repo;
   TpSocketAccessControl access_control;
@@ -915,18 +916,18 @@ salut_tube_dbus_constructor (GType type,
 
   priv = SALUT_TUBE_DBUS_GET_PRIVATE (self);
 
-  handles_repo = tp_base_connection_get_handles
-      ((TpBaseConnection *) priv->conn, priv->handle_type);
+  base_conn = TP_BASE_CONNECTION (priv->conn);
+  handles_repo = tp_base_connection_get_handles (base_conn, priv->handle_type);
 
   /* Ref the initiator handle */
   g_assert (priv->conn != NULL);
   g_assert (priv->initiator != 0);
-  contact_repo = tp_base_connection_get_handles
-      ((TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_CONTACT);
+  contact_repo = tp_base_connection_get_handles (base_conn,
+      TP_HANDLE_TYPE_CONTACT);
   tp_handle_ref (contact_repo, priv->initiator);
 
-  bus = tp_get_bus ();
-  dbus_g_connection_register_g_object (bus, priv->object_path, obj);
+  bus = tp_base_connection_get_dbus_daemon (base_conn);
+  tp_dbus_daemon_register_object (bus, priv->object_path, obj);
 
   DEBUG ("Registering at '%s'", priv->object_path);