summaryrefslogtreecommitdiff
path: root/telepathy-glib/text-channel.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-02 15:22:07 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-02 15:22:07 +0100
commit8058faf2407867dcda1aca35616dd23496b1b814 (patch)
treede639c436665339d8ca8dc5bedc81395175cdb1b /telepathy-glib/text-channel.c
parentfe88f67b789b7702d15866b80ebb989a28b6f7e6 (diff)
downloadtelepathy-glib-8058faf2407867dcda1aca35616dd23496b1b814.tar.gz
text-channel: rename static vars/function to match the feature name
The actual name of the feature is INCOMING_MESSAGE, not PENDING_MESSAGE.
Diffstat (limited to 'telepathy-glib/text-channel.c')
-rw-r--r--telepathy-glib/text-channel.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 683f80260..87890a746 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;