From e6d10afea1a7190f03c4dbbfedabff22d18ab763 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 9 Feb 2012 15:28:02 +0000 Subject: [PATCH 6/7] Deprecate tp_connection_is_ready, TpConnection:connection-ready Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 Signed-off-by: Simon McVittie --- telepathy-glib/connection.c | 8 +++++++- telepathy-glib/connection.h | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c index 79e7b06..f69b0f8 100644 --- a/telepathy-glib/connection.c +++ b/telepathy-glib/connection.c @@ -1844,10 +1844,14 @@ tp_connection_class_init (TpConnectionClass *klass) * This is similar to %TP_CONNECTION_FEATURE_CONNECTED, except that once * it has changed to %TRUE, it remains %TRUE even if the connection has * been invalidated. + * + * Deprecated: 0.17.UNRELEASED: use tp_proxy_is_prepared() with + * %TP_CHANNEL_FEATURE_CONNECTED for checks, or tp_proxy_prepare_async() for + * notification */ param_spec = g_param_spec_boolean ("connection-ready", "Connection ready?", "Initially FALSE; changes to TRUE when introspection finishes", FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED); g_object_class_install_property (object_class, PROP_CONNECTION_READY, param_spec); @@ -3185,6 +3189,8 @@ _tp_connection_add_contact (TpConnection *self, * * Returns: %TRUE if introspection has completed * Since: 0.7.17 + * Deprecated: 0.17.UNRELEASED: use tp_proxy_is_prepared() with + * %TP_CONNECTION_FEATURE_CONNECTED */ gboolean tp_connection_is_ready (TpConnection *self) diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h index cb60deb..faf2ede 100644 --- a/telepathy-glib/connection.h +++ b/telepathy-glib/connection.h @@ -152,9 +152,10 @@ void tp_connection_set_contact_info_async (TpConnection *self, gboolean tp_connection_set_contact_info_finish (TpConnection *self, GAsyncResult *result, GError **error); -gboolean tp_connection_is_ready (TpConnection *self); - #ifndef TP_DISABLE_DEPRECATED +gboolean tp_connection_is_ready (TpConnection *self) + _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_prepared); + gboolean tp_connection_run_until_ready (TpConnection *self, gboolean connect, GError **error, GMainLoop **loop) _TP_GNUC_DEPRECATED; -- 1.7.9.1