summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-11-03 17:13:43 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-11-03 17:13:43 +0000
commit6eb736d2160638508319a2d0daa9b8885dbe5938 (patch)
treeec055dbae8715feca5acd8d838ffd683f1a2bdbf
parent01b42949578ae9c0e24ba4df54eec627327af3af (diff)
TpBaseConnection: fix regression in behaviour of suppress_handler
The variable can be set in more than one place, so the previous patch was wrong.
-rw-r--r--telepathy-glib/base-connection.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 866de64c8..8394f4c8d 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