diff options
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/empathy-client-factory.c | 6 | ||||
-rw-r--r-- | libempathy/empathy-ft-factory.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index f7529bf2e..3794ef60d 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); } diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index fa52ce1aa..10c8bea08 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -182,7 +182,7 @@ handle_channels_cb (TpSimpleHandler *handler, if (tp_proxy_get_invalidated (channel) != NULL) continue; - if (!EMPATHY_IS_TP_FILE (channel)) + if (!TP_IS_FILE_TRANSFER_CHANNEL (channel)) continue; /* We handle only incoming FT */ |