[empathy: 3/15] Don't ever drop requested channels

[Sjoerd Simons <sjoerds src gnome org>]

commit 93aeafe92673b2e383fbfe3426c7ab918829d7ad
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Sep 1 14:18:42 2009 +0100

    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 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 937a165..b199f0d 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]))