Backported fix to fd.o #31720: use TpDBusDaemon to export channel objects

Backported to telepathy-sofiasip-0.6

2 files changed, 6 insertions, 6 deletions

diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c
index 0141adb..5d4f663 100644
--- a/src/sip-media-channel.c
+++ b/src/sip-media-channel.c
@@ -189,7 +189,7 @@ tpsip_media_channel_constructed (GObject *obj)
   TpBaseConnection *conn = (TpBaseConnection *)(priv->conn);
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (tpsip_media_channel_parent_class);
-  DBusGConnection *bus;
+  TpDBusDaemon *bus;
   TpHandleRepoIface *contact_repo;
   TpIntSet *set;
 
@@ -203,10 +203,10 @@ tpsip_media_channel_constructed (GObject *obj)
     tp_handle_ref (contact_repo, priv->handle);
 
   /* register object on the bus */
-  bus = tp_get_bus ();
+  bus = tp_base_connection_get_dbus_daemon (conn);
 
   DEBUG("registering object to dbus path=%s", priv->object_path);
-  dbus_g_connection_register_g_object (bus, priv->object_path, obj);
+  tp_dbus_daemon_register_object (bus, priv->object_path, obj);
 
   /* initialize group mixin */
   tp_group_mixin_init (obj,
diff --git a/src/sip-text-channel.c b/src/sip-text-channel.c
index 60e8d6c..4626dc1 100644
--- a/src/sip-text-channel.c
+++ b/src/sip-text-channel.c
@@ -166,7 +166,7 @@ tpsip_text_channel_constructed (GObject *obj)
   TpsipTextChannelPrivate *priv;
   TpBaseConnection *base_conn;
   TpHandleRepoIface *contact_handles;
-  DBusGConnection *bus;
+  TpDBusDaemon *bus;
   GObjectClass *parent_object_class =
       G_OBJECT_CLASS (tpsip_text_channel_parent_class);
 
@@ -190,8 +190,8 @@ tpsip_text_channel_constructed (GObject *obj)
                     G_CALLBACK (tpsip_text_channel_nua_r_message_cb),
                     NULL);
 
-  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);
 }