From 323a7015be7ff774b3962c27809515d0267e1262 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2012 14:38:17 +0100 Subject: [PATCH 11/21] Use tp_channel_get_connection instead of tp_channel_borrow_connection This requires telepathy-glib 0.19.9, so depend on it. Signed-off-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55391 --- configure.ac | 2 +- src/mcd-client.c | 4 ++-- src/request.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 59101a2..10c00a4 100644 --- a/configure.ac +++ b/configure.ac @@ -256,7 +256,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.19.0]) +PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.19.9]) AC_DEFINE([TP_VERSION_MIN_REQUIRED], [TP_VERSION_0_18], [Ignore post-0.18 deprecations]) AC_DEFINE([TP_VERSION_MAX_ALLOWED], [TP_VERSION_0_20], diff --git a/src/mcd-client.c b/src/mcd-client.c index 7cb9e8a..565347f 100644 --- a/src/mcd-client.c +++ b/src/mcd-client.c @@ -603,7 +603,7 @@ _mcd_client_recover_observer (McdClientProxy *self, TpChannel *channel, g_hash_table_new (NULL, NULL)); channels_array = _mcd_tp_channel_details_build_from_tp_chan (channel); - conn = tp_channel_borrow_connection (channel); + conn = tp_channel_get_connection (channel); connection_path = tp_proxy_get_object_path (conn); DEBUG ("calling ObserveChannels on %s for channel %p", @@ -1643,7 +1643,7 @@ borrow_channel_connection_path (McdChannel *channel) tp_channel = mcd_channel_get_tp_channel (channel); g_return_val_if_fail (tp_channel != NULL, "/"); - tp_connection = tp_channel_borrow_connection (tp_channel); + tp_connection = tp_channel_get_connection (tp_channel); g_return_val_if_fail (tp_connection != NULL, "/"); connection_path = tp_proxy_get_object_path (tp_connection); g_return_val_if_fail (connection_path != NULL, "/"); diff --git a/src/request.c b/src/request.c index 8ee8e5a..410a98e 100644 --- a/src/request.c +++ b/src/request.c @@ -806,7 +806,7 @@ _mcd_request_set_success (McdRequest *self, self->cancellable = FALSE; tp_svc_channel_request_emit_succeeded_with_channel (self, - tp_proxy_get_object_path (tp_channel_borrow_connection (channel)), + tp_proxy_get_object_path (tp_channel_get_connection (channel)), future_conn_props, tp_proxy_get_object_path (channel), tp_channel_borrow_immutable_properties (channel)); -- 1.7.10.4