telepathy-glib: channel-group.c: Allow using deprecated in the whole module

Xavier Claessens xclaesse at kemper.freedesktop.org
Wed May 2 05:13:29 PDT 2012


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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Wed May  2 13:53:22 2012 +0200

channel-group.c: Allow using deprecated in the whole module

That module is itself mostly deprecated and replaced by channel-contacts.c

---

 telepathy-glib/channel-group.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/channel-group.c b/telepathy-glib/channel-group.c
index 236b725..704ae3a 100644
--- a/telepathy-glib/channel-group.c
+++ b/telepathy-glib/channel-group.c
@@ -33,6 +33,9 @@
 #include "telepathy-glib/debug-internal.h"
 #include "telepathy-glib/proxy-internal.h"
 
+/* channel-group.c is ~all deprecated APIs, modern APIs are in
+ * channel-contacts.c. So we allow this module to use deprecated functions. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
 /**
  * TP_ERRORS_REMOVED_FROM_GROUP:
@@ -717,10 +720,8 @@ _tp_channel_emit_initial_sets (TpChannel *self)
       TpChannelGroupChangeReason reason;
       const gchar *message;
 
-      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       tp_channel_group_get_local_pending_info (self, handle, &actor, &reason,
           &message);
-      G_GNUC_END_IGNORE_DEPRECATIONS
 
       g_signal_emit_by_name (self, "group-members-changed", message,
           &empty_array, &empty_array, &local_pending, &empty_array, actor,
@@ -1397,3 +1398,5 @@ _tp_channel_get_group_properties (TpChannel *self)
       TP_IFACE_CHANNEL_INTERFACE_GROUP, tp_channel_got_group_properties_cb,
       NULL, NULL, NULL);
 }
+
+G_GNUC_END_IGNORE_DEPRECATIONS



More information about the telepathy-commits mailing list