Merge remote-tracking branch 'jonny/ft'

[empathy.git] / libempathy / empathy-client-factory.c

diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index a02b8b144f662c5e9ecc25de5540ba2f25da141e..035c5695625fb5404c8754c4a944d4e86824f811 100644 (file)
--- 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-client-factory.h"
 
 #include "empathy-tp-chat.h"

-#include "empathy-tp-file.h"

 #include "empathy-utils.h"
 
 #include <telepathy-yell/telepathy-yell.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));
     }
       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);
 }
 
   return chainup->create_channel (factory, conn, path, properties, error);
 }