Attachment 58027 Details for Bug 45842 – Deprecate tp_connection_manager_call_when_ready and is_ready

[patch] Deprecate tp_connection_manager_call_when_ready and is_ready

0004-Deprecate-tp_connection_manager_call_when_ready-and-.patch (text/plain), 5.78 KB, created by Simon McVittie on 2012-03-05 08:01:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-05 08:01:25 UTC

Size: 5.78 KB

patch

obsolete

>From ab3f821b6aa90487e41096920c04068f08c5233f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 5 Mar 2012 14:32:49 +0000
>Subject: [PATCH 4/4] Deprecate tp_connection_manager_call_when_ready and
> is_ready
>
>---
> telepathy-glib/connection-manager.c |   23 ++++++++++++++---------
> telepathy-glib/connection-manager.h |    9 +++++++--
> 2 files changed, 21 insertions(+), 11 deletions(-)
>
>diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
>index c2ae7b3..01c0082 100644
>--- a/telepathy-glib/connection-manager.c
>+++ b/telepathy-glib/connection-manager.c
>@@ -556,6 +556,8 @@ finally:
>  * connection manager's protocol and parameter information could be retrieved,
>  * @error is %NULL and @cm is considered to be ready. Otherwise, @error is
>  * non-%NULL and @cm is not ready.
>+ *
>+ * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_async() instead
>  */
> 
> /**
>@@ -572,6 +574,7 @@ finally:
>  * supported protocols and parameters has been retrieved.
>  *
>  * Since: 0.7.26
>+ * Deprecated: since 0.UNRELEASED, use tp_proxy_prepare_async() instead
>  */
> void
> tp_connection_manager_call_when_ready (TpConnectionManager *self,
>@@ -1545,8 +1548,8 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
>    *
>    * Emitted when the connection manager's capabilities have been discovered.
>    *
>-   * This signal is not very helpful. Since 0.7.26, using
>-   * tp_connection_manager_call_when_ready() instead is recommended.
>+   * This signal is not very helpful. Using
>+   * tp_proxy_prepare_async() instead is recommended.
>    */
>   signals[SIGNAL_GOT_INFO] = g_signal_new ("got-info",
>       G_OBJECT_CLASS_TYPE (klass),
>@@ -1566,7 +1569,7 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
>  *
>  * Convenience function to create a new connection manager proxy. If
>  * its protocol and parameter information are required, you should call
>- * tp_connection_manager_call_when_ready() on the result.
>+ * tp_proxy_prepare_async() on the result.
>  *
>  * Returns: a new reference to a connection manager proxy, or %NULL if @error
>  *          is set.
>@@ -1832,8 +1835,8 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
>  * callback when done.
>  *
>  * Since 0.7.26, this function will wait for each #TpConnectionManager
>- * to be ready, so all connection managers passed to @callback will be ready
>- * (tp_connection_manager_is_ready() will return %TRUE) unless an error
>+ * to be ready, so all connection managers passed to @callback will have
>+ * their %TP_CONNECTION_MANAGER_FEATURE_CORE feature prepared, unless an error
>  * occurred while launching that connection manager.
>  *
>  * Since: 0.7.1
>@@ -2005,6 +2008,8 @@ tp_connection_manager_get_name (TpConnectionManager *self)
>  * Returns: %TRUE, unless the #TpConnectionManager:info-source property is
>  *          %TP_CM_INFO_SOURCE_NONE
>  * Since: 0.7.26
>+ * Deprecated: since 0.UNRELEASED, use tp_proxy_is_prepared()
>+ *  with %TP_CONNECTION_MANAGER_FEATURE_CORE instead
>  */
> gboolean
> tp_connection_manager_is_ready (TpConnectionManager *self)
>@@ -2067,7 +2072,7 @@ tp_connection_manager_get_info_source (TpConnectionManager *self)
>  *
>  * If this function is called before the connection manager information has
>  * been obtained, the result is always %NULL. Use
>- * tp_connection_manager_call_when_ready() to wait for this.
>+ * tp_proxy_prepare_async() to wait for this.
>  *
>  * The result is copied and must be freed by the caller, but it is not
>  * necessarily still true after the main loop is re-entered.
>@@ -2118,7 +2123,7 @@ tp_connection_manager_dup_protocol_names (TpConnectionManager *self)
>  *
>  * If this function is called before the connection manager information has
>  * been obtained, the result is always %NULL. Use
>- * tp_connection_manager_call_when_ready() to wait for this.
>+ * tp_proxy_prepare_async() to wait for this.
>  *
>  * The result is not necessarily valid after the main loop is re-entered.
>  * Since 0.11.3, it can be copied with tp_connection_manager_protocol_copy()
>@@ -2182,8 +2187,8 @@ tp_connection_manager_get_protocol_object (TpConnectionManager *self,
>  * Return whether @protocol is supported by this connection manager.
>  *
>  * If this function is called before the connection manager information has
>- * been obtained, the result is always %FALSE. Use
>- * tp_connection_manager_call_when_ready() to wait for this.
>+ * been obtained, the result is always %FALSE. Use tp_proxy_prepare_async()
>+ * to wait for this.
>  *
>  * Returns: %TRUE if this connection manager supports @protocol
>  * Since: 0.7.26
>diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
>index e19049b..423b051 100644
>--- a/telepathy-glib/connection-manager.h
>+++ b/telepathy-glib/connection-manager.h
>@@ -117,15 +117,20 @@ void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
>     gpointer user_data, GDestroyNotify destroy,
>     GObject *weak_object);
> 
>+#ifndef TP_DISABLE_DEPRECATED
> typedef void (*TpConnectionManagerWhenReadyCb) (TpConnectionManager *cm,
>     const GError *error, gpointer user_data, GObject *weak_object);
> 
> void tp_connection_manager_call_when_ready (TpConnectionManager *self,
>     TpConnectionManagerWhenReadyCb callback,
>-    gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
>+    gpointer user_data, GDestroyNotify destroy, GObject *weak_object)
>+  _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);
>+
>+gboolean tp_connection_manager_is_ready (TpConnectionManager *self)
>+  _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_prepared);
>+#endif
> 
> const gchar *tp_connection_manager_get_name (TpConnectionManager *self);
>-gboolean tp_connection_manager_is_ready (TpConnectionManager *self);
> gboolean tp_connection_manager_is_running (TpConnectionManager *self);
> TpCMInfoSource tp_connection_manager_get_info_source (
>     TpConnectionManager *self);
>-- 
>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.