telepathy-glib: Fix regression introduced by 1aba6b49919a9ac68671fc49a525e48ccfa75c57

Xavier Claessens xclaesse at kemper.freedesktop.org
Tue Jun 5 04:08:55 PDT 2012


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

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Tue Jun  5 13:07:46 2012 +0200

Fix regression introduced by 1aba6b49919a9ac68671fc49a525e48ccfa75c57

G_GNUC_END_IGNORE_DEPRECATIONS is considered the instruction to run
for the if. So the block following is executed unconditionally.

---

 telepathy-glib/base-connection.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 07e3434..486db6e 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -219,12 +219,12 @@ gboolean tp_base_connection_channel_manager_iter_next (
     \
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
     if (!tp_base_connection_check_connected (c_, &e_)) \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
       { \
         dbus_g_method_return_error ((context), e_); \
         g_error_free (e_); \
         return; \
       } \
+    G_GNUC_END_IGNORE_DEPRECATIONS \
   } G_STMT_END
 
 TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self);



More information about the telepathy-commits mailing list