diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-29 14:04:12 -0500 |
---|---|---|
committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-29 14:04:12 -0500 |
commit | e19909986b147fb09127e0fcd3fd893d2bb7a0b8 (patch) | |
tree | 88324fa28b0cec61eadc31b0b0c3b772803f623a | |
parent | 902602630bfe37e3fe60a6e78f8958efccd4fc03 (diff) |
docs: remove remaining references to TpChannel CHAT_STATES featuremoar-deprecations
It's already been moved to TpTextChannel.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r-- | telepathy-glib/proxy.c | 12 | ||||
-rw-r--r-- | telepathy-glib/text-channel.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c index 79f7dbfea..ef65d3d89 100644 --- a/telepathy-glib/proxy.c +++ b/telepathy-glib/proxy.c @@ -1650,8 +1650,8 @@ cont: * @feature has not been requested, has not been prepared yet, or is not * available on this object at all. * - * (For instance, if @feature is %TP_CHANNEL_FEATURE_CHAT_STATES and @self - * is a #TpChannel in a protocol that doesn't actually implement chat states, + * (For instance, if @feature is %TP_CHANNEL_FEATURE_PASSWORD and @self + * is a #TpChannel in a protocol that doesn't actually implement passwords, * or is not a #TpChannel at all, then this method will return %FALSE.) * * To prepare features, call tp_proxy_prepare_async(). @@ -1685,12 +1685,12 @@ tp_proxy_is_prepared (gpointer self, * successfully or unsuccessfully yet. * * It is an error to use a @feature not specifically supported by @self - for - * instance, it is an error to use %TP_CHANNEL_FEATURE_CHAT_STATES on any + * instance, it is an error to use %TP_CHANNEL_FEATURE_PASSWORD on any * #TpProxy that is not also a #TpChannel. * * Subclasses of #TpProxy should use this method to check whether to take * action for a particular feature. For instance, #TpChannel could call this - * method for %TP_CHANNEL_CHAT_STATES when it discovers that the ChatStates + * method for %TP_CHANNEL_FEATURE_PASSWORD when it discovers that the Password * interface is supported, to decide whether to fetch the state of that * interface. * @@ -1845,7 +1845,7 @@ prepare_depends (TpProxy *self, * #TpProxy itself does not support any features, but subclasses like * #TpChannel can support features, which can either be core functionality like * %TP_CHANNEL_FEATURE_CORE, or extended functionality like - * %TP_CHANNEL_FEATURE_CHAT_STATES. + * %TP_CHANNEL_FEATURE_PASSWORD. * * Proxy instances start with no features prepared. When features are * requested via tp_proxy_prepare_async(), the proxy starts to do the @@ -1877,7 +1877,7 @@ prepare_depends (TpProxy *self, * is no longer useful, it will also emit #TpProxy::invalidated. * * If a feature represents non-essential functionality - * (like %TP_CHANNEL_FEATURE_CHAT_STATES), or is not supported by the object + * (like %TP_CHANNEL_FEATURE_PASSWORD), or is not supported by the object * at all, then failure to prepare it is not fatal: * tp_proxy_prepare_async() will complete successfully, but * tp_proxy_is_prepared() will still return %FALSE for the feature, and diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c index 705e2b0ec..2fef5b773 100644 --- a/telepathy-glib/text-channel.c +++ b/telepathy-glib/text-channel.c @@ -1101,7 +1101,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass) * @state: the new #TpChannelChatState for the contact * * Emitted when a contact's chat state changes after tp_proxy_prepare_async() - * has finished preparing the feature %TP_CHANNEL_FEATURE_CHAT_STATES. + * has finished preparing the feature %TP_TEXT_CHANNEL_FEATURE_CHAT_STATES. * * Since: 0.UNRELEASED */ @@ -1933,7 +1933,7 @@ tp_text_channel_get_feature_quark_chat_states (void) * * Return the chat state for the given contact. If * tp_proxy_is_prepared() would return %FALSE for the feature - * %TP_CHANNEL_FEATURE_CHAT_STATES, the result will always be + * %TP_TEXT_CHANNEL_FEATURE_CHAT_STATES, the result will always be * %TP_CHANNEL_CHAT_STATE_INACTIVE. * * Returns: the chat state for @contact, or |