summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-16 13:54:31 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-12-16 15:18:59 (GMT)
commit64f4b4ea54824b879878ade739843e099078f327 (patch)
tree08cbf38ab2bb70af398508d64cf6855b4ca59696
parent9eca18317b370759493cdc53d0117f6b5da1cb74 (diff)
downloadtelepathy-glib-64f4b4ea54824b879878ade739843e099078f327.tar.gz
telepathy-glib-64f4b4ea54824b879878ade739843e099078f327.tar.xz
rename TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES to TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES
-rw-r--r--docs/reference/telepathy-glib-sections.txt4
-rw-r--r--examples/client/text-handler.c2
-rw-r--r--telepathy-glib/automatic-proxy-factory.c4
-rw-r--r--telepathy-glib/text-channel.c26
-rw-r--r--telepathy-glib/text-channel.h6
-rw-r--r--tests/dbus/text-channel.c11
6 files changed, 26 insertions, 27 deletions
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index 0e4b8b9..2c7c7ed 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -5392,7 +5392,7 @@ tp_text_channel_get_supported_content_types
tp_text_channel_get_message_part_support_flags
tp_text_channel_get_delivery_reporting_support
tp_text_channel_get_pending_messages
-TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES
+TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES
tp_text_channel_send_message_async
tp_text_channel_send_message_finish
tp_text_channel_ack_messages_async
@@ -5411,5 +5411,5 @@ TP_TYPE_TEXT_CHANNEL
tp_text_channel_get_type
TpTextChannelPrivate
<SUBSECTION Private>
-tp_text_channel_get_feature_quark_pending_messages
+tp_text_channel_get_feature_quark_incoming_messages
</SECTION>
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index e67819d..d093b30 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -105,7 +105,7 @@ handle_channels_cb (TpSimpleHandler *self,
G_CALLBACK (message_received_cb), NULL);
/* The default channel factory used by the TpSimpleHandler has
- * already prepared TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES,
+ * already prepared TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES,
* if possible. */
display_pending_messages (text_chan);
}
diff --git a/telepathy-glib/automatic-proxy-factory.c b/telepathy-glib/automatic-proxy-factory.c
index 33fb1e4..360d4ee 100644
--- a/telepathy-glib/automatic-proxy-factory.c
+++ b/telepathy-glib/automatic-proxy-factory.c
@@ -57,7 +57,7 @@
* type of channels.</para>
* </listitem>
* <listitem>
- * <para>%TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES for
+ * <para>%TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES for
* #TpTextChannel</para>
* </listitem>
* </itemizedlist>
@@ -184,7 +184,7 @@ tp_automatic_proxy_factory_dup_channel_features_impl (TpChannel *channel)
if (TP_IS_TEXT_CHANNEL (channel))
{
- feature = TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES;
+ feature = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES;
g_array_append_val (features, feature);
}
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index bf16a0e..10776d0 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -571,7 +571,7 @@ got_pending_senders_contact_by_handle_cb (TpConnection *connection,
out:
_tp_proxy_set_feature_prepared (TP_PROXY (self),
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, TRUE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, TRUE);
}
static void
@@ -608,7 +608,7 @@ got_pending_senders_contact_by_id_cb (TpConnection *connection,
out:
_tp_proxy_set_feature_prepared (TP_PROXY (self),
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, TRUE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, TRUE);
}
static void
@@ -648,7 +648,7 @@ get_pending_messages_cb (TpProxy *proxy,
DEBUG ("Failed to get PendingMessages property: %s", error->message);
_tp_proxy_set_feature_prepared (proxy,
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, FALSE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, FALSE);
return;
}
@@ -657,7 +657,7 @@ get_pending_messages_cb (TpProxy *proxy,
DEBUG ("PendingMessages property is of the wrong type");
_tp_proxy_set_feature_prepared (proxy,
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, FALSE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, FALSE);
return;
}
@@ -701,7 +701,7 @@ get_pending_messages_cb (TpProxy *proxy,
if (tp_intset_size (senders) == 0)
{
_tp_proxy_set_feature_prepared (proxy,
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, TRUE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, TRUE);
}
else
{
@@ -776,7 +776,7 @@ fail:
g_error_free (error);
_tp_proxy_set_feature_prepared (proxy,
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, TRUE);
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, TRUE);
}
enum {
@@ -793,7 +793,7 @@ tp_text_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
return features;
features[FEAT_PENDING_MESSAGES].name =
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES;
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES;
features[FEAT_PENDING_MESSAGES].start_preparing =
tp_text_channel_prepare_pending_messages;
@@ -873,7 +873,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
* received on @self.
*
* Note that this signal is only fired once the
- * #TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES has been prepared.
+ * #TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES has been prepared.
*
* Since: 0.13.UNRELEASED
*/
@@ -894,7 +894,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
* has been acked and so removed from the pending messages list.
*
* Note that this signal is only fired once the
- * #TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES has been prepared.
+ * #TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES has been prepared.
*
* Since: 0.13.UNRELEASED
*/
@@ -1037,10 +1037,10 @@ tp_text_channel_get_delivery_reporting_support (
}
/**
- * TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES:
+ * TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES:
*
* Expands to a call to a function that returns a quark representing the
- * Pending Messages features of a #TpTextChannel.
+ * incoming messages features of a #TpTextChannel.
*
* When this feature is prepared, the initial value of the
* #TpTextChannel:pending-messages property has been fetched
@@ -1052,10 +1052,10 @@ tp_text_channel_get_delivery_reporting_support (
* Since: 0.13.UNRELEASED
*/
GQuark
-tp_text_channel_get_feature_quark_pending_messages (void)
+tp_text_channel_get_feature_quark_incoming_messages (void)
{
return g_quark_from_static_string (
- "tp-text-channel-feature-pending-messages");
+ "tp-text-channel-feature-incoming-messages");
}
/**
diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h
index 622e37e..b932536 100644
--- a/telepathy-glib/text-channel.h
+++ b/telepathy-glib/text-channel.h
@@ -68,9 +68,9 @@ TpMessagePartSupportFlags tp_text_channel_get_message_part_support_flags (
TpDeliveryReportingSupportFlags tp_text_channel_get_delivery_reporting_support (
TpTextChannel *self);
-#define TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES \
- tp_text_channel_get_feature_quark_pending_messages ()
-GQuark tp_text_channel_get_feature_quark_pending_messages (void) G_GNUC_CONST;
+#define TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES \
+ tp_text_channel_get_feature_quark_incoming_messages ()
+GQuark tp_text_channel_get_feature_quark_incoming_messages (void) G_GNUC_CONST;
GList * tp_text_channel_get_pending_messages (TpTextChannel *self);
diff --git a/tests/dbus/text-channel.c b/tests/dbus/text-channel.c
index d8d6338..f7a5a25 100644
--- a/tests/dbus/text-channel.c
+++ b/tests/dbus/text-channel.c
@@ -227,7 +227,7 @@ static void
test_pending_messages (Test *test,
gconstpointer data G_GNUC_UNUSED)
{
- GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, 0 };
+ GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, 0 };
GList *messages;
TpMessage *msg;
gchar *text;
@@ -275,7 +275,7 @@ test_pending_messages (Test *test,
g_assert_no_error (test->error);
g_assert (tp_proxy_is_prepared (test->channel,
- TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES));
+ TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES));
/* We have the pending messages now */
messages = tp_text_channel_get_pending_messages (test->channel);
@@ -324,14 +324,13 @@ static void
test_message_received (Test *test,
gconstpointer data G_GNUC_UNUSED)
{
- GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, 0 };
+ GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, 0 };
TpMessage *msg;
gchar *text;
TpContact *sender;
/* We have to prepare the pending messages feature to be notified about
* incoming messages */
- /* FIXME: Shouldn't we rename this feature then ? */
tp_proxy_prepare_async (test->channel, features,
proxy_prepare_cb, test);
@@ -381,7 +380,7 @@ static void
test_ack_messages (Test *test,
gconstpointer data G_GNUC_UNUSED)
{
- GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, 0 };
+ GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, 0 };
GList *messages;
TpMessage *msg;
@@ -462,7 +461,7 @@ static void
test_ack_message (Test *test,
gconstpointer data G_GNUC_UNUSED)
{
- GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_PENDING_MESSAGES, 0 };
+ GQuark features[] = { TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES, 0 };
GList *messages;
TpMessage *msg;