diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-01 11:43:34 +0200 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-10-04 11:05:33 -0400 |
commit | 2bc32019706f3d2891d918e1891722fb9c9a7638 (patch) | |
tree | 967b886c79f8038f05fe494123a5c71800ca52cf | |
parent | 4b70750226de173b737efeed1aedb63b930351dd (diff) |
Messages has been merged with Text
https://bugs.freedesktop.org/show_bug.cgi?id=69964
-rw-r--r-- | rakia/text-channel.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/rakia/text-channel.c b/rakia/text-channel.c index 9f0c378..cbdc1c8 100644 --- a/rakia/text-channel.c +++ b/rakia/text-channel.c @@ -57,9 +57,7 @@ G_DEFINE_TYPE_WITH_CODE (RakiaTextChannel, rakia_text_channel, TP_TYPE_BASE_CHAN G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, tp_dbus_properties_mixin_iface_init); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT, - tp_message_mixin_text_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES, - tp_message_mixin_messages_iface_init); + tp_message_mixin_iface_init); G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE, destroyable_iface_init)); @@ -193,10 +191,10 @@ rakia_text_channel_fill_immutable_properties (TpBaseChannel *chan, tp_dbus_properties_mixin_fill_properties_hash ( G_OBJECT (chan), properties, - TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "MessagePartSupportFlags", - TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "DeliveryReportingSupport", - TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "SupportedContentTypes", - TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "MessageTypes", + TP_IFACE_CHANNEL_TYPE_TEXT, "MessagePartSupportFlags", + TP_IFACE_CHANNEL_TYPE_TEXT, "DeliveryReportingSupport", + TP_IFACE_CHANNEL_TYPE_TEXT, "SupportedContentTypes", + TP_IFACE_CHANNEL_TYPE_TEXT, "MessageTypes", NULL); } @@ -215,7 +213,6 @@ rakia_text_channel_get_interfaces (TpBaseChannel *base) interfaces = TP_BASE_CHANNEL_CLASS ( rakia_text_channel_parent_class)->get_interfaces (base); - g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_MESSAGES); g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE); return interfaces; |