From ff41ac0db33211c3233d570f54827a0547c8519e Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 9 Feb 2012 15:27:37 +0000
Subject: [PATCH 4/7] Deprecate tp_channel_is_ready and
TpChannel:channel-ready
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---
telepathy-glib/channel.c | 8 +++++++-
telepathy-glib/channel.h | 4 +++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index d447c04..8c438d0 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -372,6 +372,8 @@ tp_channel_get_identifier (TpChannel *self)
*
* Returns: %TRUE if introspection has completed
* Since: 0.7.12
+ * Deprecated: 0.17.UNRELEASED: use tp_proxy_is_prepared() with
+ * %TP_CHANNEL_FEATURE_CORE
*/
gboolean
tp_channel_is_ready (TpChannel *self)
@@ -1605,10 +1607,14 @@ tp_channel_class_init (TpChannelClass *klass)
* invalidated - but tp_proxy_is_prepared() returns %FALSE for all features.
*
* Change notification is via notify::channel-ready.
+ *
+ * Deprecated: 0.17.UNRELEASED: use tp_proxy_is_prepared() with
+ * %TP_CHANNEL_FEATURE_CORE for checks, or tp_proxy_prepare_async() for
+ * notification
*/
param_spec = g_param_spec_boolean ("channel-ready", "Channel 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_CHANNEL_READY,
param_spec);
diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
index 98f6e98..aeaa712 100644
--- a/telepathy-glib/channel.h
+++ b/telepathy-glib/channel.h
@@ -92,11 +92,13 @@ typedef void (*TpChannelWhenReadyCb) (TpChannel *channel, const GError *error,
void tp_channel_call_when_ready (TpChannel *self,
TpChannelWhenReadyCb callback,
gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);
+
+gboolean tp_channel_is_ready (TpChannel *self)
+ _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_ready);
#endif
void tp_channel_init_known_interfaces (void);
-gboolean tp_channel_is_ready (TpChannel *self);
const gchar *tp_channel_get_channel_type (TpChannel *self);
GQuark tp_channel_get_channel_type_id (TpChannel *self);
TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type);
--
1.7.9.1