diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-07 14:38:17 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-08 19:54:02 +0100 |
commit | 13dc2df37a46506647a58db2a36f837bd92eedf9 (patch) | |
tree | 148c9de17886101a4f5e8c88c6298379c1db671b | |
parent | 768caa0e6f72fd2ff2826ff6b165abea7a4fcbcd (diff) |
tp_text_channel_get_message_types, TpTextChannel:message-types: remove
They have a dbus-glib type, and Empathy exclusively uses
tp_text_channel_supports_message_type() instead.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77139
Reviewed-by: Xavier Claessens
-rw-r--r-- | docs/reference/telepathy-glib/telepathy-glib-sections.txt | 1 | ||||
-rw-r--r-- | telepathy-glib/text-channel.c | 40 | ||||
-rw-r--r-- | telepathy-glib/text-channel.h | 2 | ||||
-rw-r--r-- | telepathy-glib/versions/main-1.0.abi | 1 | ||||
-rw-r--r-- | tests/dbus/text-channel.c | 24 |
5 files changed, 0 insertions, 68 deletions
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt index 4fd8d9eb1..754a5af38 100644 --- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt @@ -5312,7 +5312,6 @@ 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_dup_pending_messages -tp_text_channel_get_message_types TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES tp_text_channel_send_message_async tp_text_channel_send_message_finish diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c index 6903c9aff..d7fc14841 100644 --- a/telepathy-glib/text-channel.c +++ b/telepathy-glib/text-channel.c @@ -158,11 +158,6 @@ tp_text_channel_get_property (GObject *object, tp_text_channel_get_delivery_reporting_support (self)); break; - case PROP_MESSAGE_TYPES: - g_value_set_boxed (value, - tp_text_channel_get_message_types (self)); - break; - case PROP_IS_SMS_CHANNEL: g_value_set_boolean (value, tp_text_channel_is_sms_channel (self)); break; @@ -943,22 +938,6 @@ tp_text_channel_class_init (TpTextChannelClass *klass) g_object_class_install_property (gobject_class, PROP_DELIVERY_REPORTING_SUPPORT, param_spec); - /** - * TpTextChannel:message-types: - * - * A #GArray containing the #TpChannelTextMessageType which may be sent on - * this channel. - * - * Since: 0.13.16 - */ - param_spec = g_param_spec_boxed ("message-types", - "MessageTypes", - "The MessageTypes property of the channel", - DBUS_TYPE_G_UINT_ARRAY, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (gobject_class, - PROP_MESSAGE_TYPES, param_spec); - /** * TpTextChannel:is-sms-channel: * @@ -1660,25 +1639,6 @@ tp_text_channel_set_chat_state_finish (TpTextChannel *self, } /** - * tp_text_channel_get_message_types: - * @self: a #TpTextChannel - * - * Return the #TpTextChannel:message-types property - * - * Returns: (transfer none) (element-type TelepathyGLib.ChannelTextMessageType): - * the value of #TpTextChannel:message-types - * - * Since: 0.13.16 - */ -GArray * -tp_text_channel_get_message_types (TpTextChannel *self) -{ - g_return_val_if_fail (TP_IS_TEXT_CHANNEL (self), NULL); - - return self->priv->message_types; -} - -/** * tp_text_channel_supports_message_type: * @self: a #TpTextChannel * @message_type: a #TpChannelTextMessageType diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h index af27143f3..cc222f112 100644 --- a/telepathy-glib/text-channel.h +++ b/telepathy-glib/text-channel.h @@ -70,8 +70,6 @@ TpMessagePartSupportFlags tp_text_channel_get_message_part_support_flags ( TpDeliveryReportingSupportFlags tp_text_channel_get_delivery_reporting_support ( TpTextChannel *self); -GArray * tp_text_channel_get_message_types (TpTextChannel *self); - gboolean tp_text_channel_supports_message_type (TpTextChannel *self, TpChannelTextMessageType message_type); diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi index 4616e9213..d34f74124 100644 --- a/telepathy-glib/versions/main-1.0.abi +++ b/telepathy-glib/versions/main-1.0.abi @@ -1139,7 +1139,6 @@ tp_text_channel_get_feature_quark_chat_states tp_text_channel_get_feature_quark_incoming_messages tp_text_channel_get_feature_quark_sms tp_text_channel_get_message_part_support_flags -tp_text_channel_get_message_types tp_text_channel_get_sms_flash tp_text_channel_get_sms_length_async tp_text_channel_get_sms_length_finish diff --git a/tests/dbus/text-channel.c b/tests/dbus/text-channel.c index 7d2cc7307..3466cc004 100644 --- a/tests/dbus/text-channel.c +++ b/tests/dbus/text-channel.c @@ -173,22 +173,6 @@ test_creation (Test *test, } static void -check_messages_types (GArray *message_types) -{ - TpChannelTextMessageType type; - - g_assert (message_types != NULL); - g_assert_cmpuint (message_types->len, ==, 3); - - type = g_array_index (message_types, TpChannelTextMessageType, 0); - g_assert_cmpuint (type, ==, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL); - type = g_array_index (message_types, TpChannelTextMessageType, 1); - g_assert_cmpuint (type, ==, TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION); - type = g_array_index (message_types, TpChannelTextMessageType, 2); - g_assert_cmpuint (type, ==, TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE); -} - -static void test_properties (Test *test, gconstpointer data G_GNUC_UNUSED) { @@ -196,13 +180,11 @@ test_properties (Test *test, const gchar * const * content_types2; TpMessagePartSupportFlags message_part; TpDeliveryReportingSupportFlags delivery; - GArray *message_types; g_object_get (test->channel, "supported-content-types", &content_types, "message-part-support-flags", &message_part, "delivery-reporting-support", &delivery, - "message-types", &message_types, NULL); /* SupportedContentTypes */ @@ -228,12 +210,6 @@ test_properties (Test *test, tp_text_channel_get_delivery_reporting_support (test->channel)); /* MessageTypes */ - check_messages_types (message_types); - g_array_unref (message_types); - - message_types = tp_text_channel_get_message_types (test->channel); - check_messages_types (message_types); - g_assert (tp_text_channel_supports_message_type (test->channel, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL)); g_assert (tp_text_channel_supports_message_type (test->channel, |