Revert "Revert "contact-blocking-dialog: use tp-glib high level blocking API""

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

diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 56e16629f47251cea5497dd58e805b9e1661e554..beaa62157fe8b13a591997cc75e49bb1de3f592e 100644 (file)
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -24,6 +24,7 @@
 #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>
@@ -88,6 +89,11 @@ 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);
 }
@@ -125,6 +131,9 @@ empathy_client_factory_dup_account_features (TpSimpleClientFactory *factory,
   feature = TP_ACCOUNT_FEATURE_CONNECTION;
   g_array_append_val (features, feature);
 
+  feature = TP_ACCOUNT_FEATURE_ADDRESSING;
+  g_array_append_val (features, feature);
+
   return features;
 }
 
@@ -143,6 +152,15 @@ empathy_client_factory_dup_connection_features (TpSimpleClientFactory *factory,
   feature = TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS;
   g_array_append_val (features, feature);
 
+  feature = TP_CONNECTION_FEATURE_CONTACT_INFO;
+  g_array_append_val (features, feature);
+
+  feature = TP_CONNECTION_FEATURE_BALANCE;
+  g_array_append_val (features, feature);
+
+  feature = TP_CONNECTION_FEATURE_CONTACT_BLOCKING;
+  g_array_append_val (features, feature);
+
   return features;
 }