diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-18 13:45:40 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-11-18 13:45:40 +0000 |
commit | 34dbdead1e26567a3262979e38e9272b1e5d23af (patch) | |
tree | a3e4bc07dc535d667c4da1be2f5cd3bc7a32dc7b /src | |
parent | 1c9931a882038ac20ab45fe6de015cb8b76a841b (diff) |
fd.o #31720: use TpDBusDaemon to export channel objects
Diffstat (limited to 'src')
-rw-r--r-- | src/sip-media-channel.c | 6 | ||||
-rw-r--r-- | src/sip-text-channel.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/sip-media-channel.c b/src/sip-media-channel.c index c6d6df5..27c4a3d 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 23159fd..49e0b5a 100644 --- a/src/sip-text-channel.c +++ b/src/sip-text-channel.c @@ -161,7 +161,7 @@ tpsip_text_channel_constructed (GObject *obj) TpsipTextChannelPrivate *priv; TpBaseConnection *base_conn; TpHandleRepoIface *contact_handles; - DBusGConnection *bus; + TpDBusDaemon *bus; TpChannelTextMessageType types[] = { TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL, }; @@ -201,8 +201,8 @@ tpsip_text_channel_constructed (GObject *obj) TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES, supported_content_types); - 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); } |