diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-09 15:42:07 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-05 12:33:42 +0000 |
| commit | 4fb68b07fc1adc48b88858a85639b38bbb4f2271 (patch) | |
| tree | 9c8de0ad701be751358cb3a225533f171d87b8b6 /telepathy-glib/contact.c | |
| parent | ebc0d0068b1d362e06767cab760991a09dd862ea (diff) | |
| download | telepathy-glib-4fb68b07fc1adc48b88858a85639b38bbb4f2271.tar.gz | |
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>
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/contact.c')
| -rw-r--r-- | 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 46c2826d2..5490122b2 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); |