diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
| commit | b5764db7cf39aeaaabc261ece49c57776540a0be (patch) | |
| tree | 7cadc15c0f9c1c9b7ff7d21de7020201add612aa /libempathy/empathy-client-factory.c | |
| parent | 67869e50ff885ea10280447edbe6ee22520e26cb (diff) | |
| parent | 82b0f4038f7c257253962080270e5625dd5de152 (diff) | |
| download | gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.gz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.bz2 gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.lz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.xz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.zst gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.zip | |
Merge remote-tracking branch 'jonny/ft'
Conflicts:
libempathy/empathy-tp-file.c
Diffstat (limited to 'libempathy/empathy-client-factory.c')
| -rw-r--r-- | libempathy/empathy-client-factory.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index a02b8b144..035c56956 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -24,7 +24,6 @@ #include "empathy-client-factory.h" #include "empathy-tp-chat.h" -#include "empathy-tp-file.h" #include "empathy-utils.h" #include <telepathy-yell/telepathy-yell.h> @@ -89,11 +88,6 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory, return TP_CHANNEL (call_channel_new_with_factory ( TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error)); } - else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) - { - return TP_CHANNEL (empathy_tp_file_new ( - TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error)); - } return chainup->create_channel (factory, conn, path, properties, error); } |