From 93aeafe92673b2e383fbfe3426c7ab918829d7ad Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 1 Sep 2009 14:18:42 +0100 Subject: Don't ever drop requested channels Before moving to the ChannelDispatcher we got channels either through the NewChannel(s) signal or as a result of requesting a channel from the CM. Now that we've moved to the ChannelDispatcher, we only get channels that we should handle through HandleChannels. So we shouldn't filter any of them. --- libempathy/empathy-dispatcher.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 937a16521..b199f0de5 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -650,17 +650,6 @@ dispatcher_connection_new_channel (EmpathyDispatcher *self, if (g_hash_table_lookup (cd->outstanding_channels, object_path) != NULL) return; - /* Only pick up non-requested text and file channels. For all other it - * doesn't make sense to handle it if we didn't request it. The same goes - * for channels we discovered by the Channels property or ListChannels */ - if (!incoming && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT) - && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) - { - DEBUG ("Ignoring incoming channel of type %s on %s", - channel_type, object_path); - return; - } - for (i = 0 ; blacklist[i] != NULL; i++) { if (!tp_strdiff (channel_type, blacklist[i])) -- cgit v1.2.3