From f2a0306b096a52d9f58b48c3c04a3a56cbd74a87 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 16 Jan 2009 17:02:35 +0000 Subject: EmpathyDispatcher: Handle File channels that we didn't request. Signed-off-by: Jonny Lamb svn path=/trunk/; revision=2237 --- libempathy/empathy-dispatcher.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index b0084ab62..e8f7b8c7e 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -515,10 +515,11 @@ dispatcher_connection_new_channel (EmpathyDispatcher *dispatcher, if (g_hash_table_lookup (cd->outstanding_channels, object_path) != NULL) return; - /* Only pick up non-requested text 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)) + /* 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, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) { DEBUG ("Ignoring incoming channel of type %s on %s", channel_type, object_path); -- cgit v1.2.3