[Telepathy-commits] [telepathy-glib/master] TpBaseConnection: fix regression in behaviour of suppress_handler

[Simon McVittie]

The variable can be set in more than one place, so the previous patch
was wrong.
---
 telepathy-glib/base-connection.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 866de64..8394f4c 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -1018,6 +1018,9 @@ break_loop_early:
    * suppress_handler set when signalling NewChannel */
   if (request_tokens != NULL &&
       (satisfies_create_channel || !satisfies_request_channel))
+    suppress_handler = TRUE;
+
+  if (suppress_handler)
     g_hash_table_insert (context->suppress_handler, channel, channel);
 
   /* If the only type of request satisfied by this new channel is
-- 
1.5.6.5