aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-01-17 01:02:35 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-01-17 01:02:35 +0800
commitf2a0306b096a52d9f58b48c3c04a3a56cbd74a87 (patch)
tree487549544b33346f2b30abb46953cfac394f9b76
parentf542337fdadd7d15e3e0de27e1b4650078f38301 (diff)
downloadgsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar.gz
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar.bz2
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar.lz
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar.xz
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.tar.zst
gsoc2013-empathy-f2a0306b096a52d9f58b48c3c04a3a56cbd74a87.zip
EmpathyDispatcher: Handle File channels that we didn't request.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=2237
-rw-r--r--libempathy/empathy-dispatcher.c9
1 files changed, 5 insertions, 4 deletions
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);