Attachment 57944 Details for Bug 45842 – TpContact: stop using about-to-be-deprecated Connection API

[patch] TpContact: stop using about-to-be-deprecated Connection API

0005-TpContact-stop-using-about-to-be-deprecated-Connecti.patch (text/plain), 3.02 KB, created by Simon McVittie on 2012-03-02 11:29:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-02 11:29:18 UTC

Size: 3.02 KB

patch

obsolete

>From befec1b4cf12fd4798696e529e9de03b7b202142 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 9 Feb 2012 15:42:07 +0000
>Subject: [PATCH 5/7] TpContact: stop using about-to-be-deprecated Connection
> API
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> telepathy-glib/contact.c |   20 ++++++++++----------
> 1 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
>index 46c2826..5490122 100644
>--- a/telepathy-glib/contact.c
>+++ b/telepathy-glib/contact.c
>@@ -4101,8 +4101,8 @@ contacts_context_remove_common_features (ContactsContext *context)
> 
> /**
>  * tp_connection_get_contacts_by_handle:
>- * @self: A connection, which must be ready (#TpConnection:connection-ready
>- *  must be %TRUE)
>+ * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED
>+ *  feature prepared
>  * @n_handles: The number of handles in @handles (must be at least 1)
>  * @handles: (array length=n_handles) (element-type uint): An array of handles
>  *  of type %TP_HANDLE_TYPE_CONTACT representing the desired contacts
>@@ -4223,8 +4223,8 @@ tp_connection_get_contacts_by_handle (TpConnection *self,
> 
> /**
>  * tp_connection_upgrade_contacts:
>- * @self: A connection, which must be ready (#TpConnection:connection-ready
>- *  must be %TRUE)
>+ * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED
>+ *  feature prepared
>  * @n_contacts: The number of contacts in @contacts (must be at least 1)
>  * @contacts: (array length=n_contacts): An array of #TpContact objects
>  *  associated with @self
>@@ -4265,8 +4265,8 @@ tp_connection_upgrade_contacts (TpConnection *self,
>   ContactsContext *context;
>   guint i;
> 
>-  g_return_if_fail (tp_connection_is_ready (self));
>-  g_return_if_fail (tp_proxy_get_invalidated (self) == NULL);
>+  g_return_if_fail (tp_proxy_is_prepared (self,
>+        TP_CONNECTION_FEATURE_CONNECTED));
>   g_return_if_fail (n_contacts >= 1);
>   g_return_if_fail (contacts != NULL);
>   g_return_if_fail (n_features == 0 || features != NULL);
>@@ -4436,8 +4436,8 @@ contacts_requested_handles (TpConnection *connection,
> 
> /**
>  * tp_connection_get_contacts_by_id:
>- * @self: A connection, which must be ready (#TpConnection:connection-ready
>- *  must be %TRUE)
>+ * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED
>+ *  feature prepared
>  * @n_ids: The number of IDs in @ids (must be at least 1)
>  * @ids: (array length=n_ids) (transfer none): An array of strings representing
>  *  the desired contacts by their
>@@ -4481,8 +4481,8 @@ tp_connection_get_contacts_by_id (TpConnection *self,
>   ContactsContext *context;
>   guint i;
> 
>-  g_return_if_fail (tp_connection_is_ready (self));
>-  g_return_if_fail (tp_proxy_get_invalidated (self) == NULL);
>+  g_return_if_fail (tp_proxy_is_prepared (self,
>+        TP_CONNECTION_FEATURE_CONNECTED));
>   g_return_if_fail (n_ids >= 1);
>   g_return_if_fail (ids != NULL);
>   g_return_if_fail (ids[0] != NULL);
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 45842: 57940 | 57941 | 57942 | 57943 | 57944 | 57945 | 57946 | 58024 | 58025 | 58026 | 58027 | 58031 | 58032 | 58053

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.