aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-09-01 21:18:42 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-02-24 23:55:53 +0800
commit93aeafe92673b2e383fbfe3426c7ab918829d7ad (patch)
tree32925cb080af9cfa01a977daa88adf00a9fbaad8
parent6c349195014a84995fa3283611eebd77f66046d3 (diff)
downloadgsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar.gz
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar.bz2
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar.lz
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar.xz
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.tar.zst
gsoc2013-empathy-93aeafe92673b2e383fbfe3426c7ab918829d7ad.zip
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.
-rw-r--r--libempathy/empathy-dispatcher.c11
1 files changed, 0 insertions, 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]))