[next] telepathy-rakia: Adapt for removal of TpDBusDaemon
Simon McVittie
smcv at kemper.freedesktop.org
Thu Apr 3 07:33:36 PDT 2014
Module: telepathy-rakia
Branch: next
Commit: a8bac127974fc41d1efe4a9689821d98f9ac42b2
URL: http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=a8bac127974fc41d1efe4a9689821d98f9ac42b2
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Apr 1 15:59:00 2014 +0100
Adapt for removal of TpDBusDaemon
---
rakia/call-content.c | 4 ++--
rakia/call-stream.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rakia/call-content.c b/rakia/call-content.c
index 6ecda3a..8364c02 100644
--- a/rakia/call-content.c
+++ b/rakia/call-content.c
@@ -152,7 +152,7 @@ rakia_call_content_constructed (GObject *object)
if (creator == tp_base_channel_get_self_handle (bchan))
{
TpCallContentMediaDescription *md;
- TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon (
+ GDBusConnection *bus = tp_base_connection_get_dbus_connection (
tp_base_call_content_get_connection (bcc));
object_path = g_strdup_printf ("%s/InitialOffer",
@@ -328,7 +328,7 @@ media_remote_codecs_updated_cb (RakiaSipMedia *media, gboolean is_offer,
GPtrArray *remote_codecs =
rakia_sip_media_get_remote_codec_offer (priv->media);
TpCallContentMediaDescription *md;
- TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon (
+ GDBusConnection *bus = tp_base_connection_get_dbus_connection (
tp_base_call_content_get_connection (bcc));
gchar *object_path;
guint i, j;
diff --git a/rakia/call-stream.c b/rakia/call-stream.c
index 6ad5945..9fc0c34 100644
--- a/rakia/call-stream.c
+++ b/rakia/call-stream.c
@@ -520,7 +520,7 @@ media_remote_candidates_updated_cb (RakiaSipMedia *media, RakiaCallStream *self)
TpBaseCallStream *bcs = TP_BASE_CALL_STREAM (self);
TpBaseMediaCallStream *bmcs = TP_BASE_MEDIA_CALL_STREAM (self);
GPtrArray *candidates = rakia_sip_media_get_remote_candidates (media);
- TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon (
+ GDBusConnection *bus = tp_base_connection_get_dbus_connection (
tp_base_call_stream_get_connection (bcs));
gchar *object_path;
guint i;
More information about the telepathy-commits
mailing list