telepathy-glib: text-channel: rename static vars/ function to match the feature name

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Wed Jan 2 06:25:45 PST 2013


Module: telepathy-glib
Branch: master
Commit: 8058faf2407867dcda1aca35616dd23496b1b814
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=8058faf2407867dcda1aca35616dd23496b1b814

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed Jan  2 15:22:07 2013 +0100

text-channel: rename static vars/function to match the feature name

The actual name of the feature is INCOMING_MESSAGE, not PENDING_MESSAGE.

---

 telepathy-glib/text-channel.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 683f802..87890a7 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -720,7 +720,7 @@ get_pending_messages_cb (TpProxy *proxy,
 }
 
 static void
-tp_text_channel_prepare_pending_messages_async (TpProxy *proxy,
+tp_text_channel_prepare_incoming_messages_async (TpProxy *proxy,
     const TpProxyFeature *feature,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -751,7 +751,7 @@ tp_text_channel_prepare_pending_messages_async (TpProxy *proxy,
   g_assert (self->priv->pending_messages_result == NULL);
   self->priv->pending_messages_result = g_simple_async_result_new (
       (GObject *) proxy, callback, user_data,
-      tp_text_channel_prepare_pending_messages_async);
+      tp_text_channel_prepare_incoming_messages_async);
 
 
   tp_cli_dbus_properties_call_get (proxy, -1,
@@ -842,7 +842,7 @@ tp_text_channel_prepare_sms_async (TpProxy *proxy,
 }
 
 enum {
-    FEAT_PENDING_MESSAGES,
+    FEAT_INCOMING_MESSAGES,
     FEAT_SMS,
     FEAT_CHAT_STATES,
     N_FEAT
@@ -858,10 +858,10 @@ tp_text_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
   if (G_LIKELY (features[0].name != 0))
     return features;
 
-  features[FEAT_PENDING_MESSAGES].name =
+  features[FEAT_INCOMING_MESSAGES].name =
     TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES;
-  features[FEAT_PENDING_MESSAGES].prepare_async =
-    tp_text_channel_prepare_pending_messages_async;
+  features[FEAT_INCOMING_MESSAGES].prepare_async =
+    tp_text_channel_prepare_incoming_messages_async;
 
   features[FEAT_SMS].name =
     TP_TEXT_CHANNEL_FEATURE_SMS;



More information about the telepathy-commits mailing list