EmpathySmileyManager: use the proper Unicode characters

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

diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 603f4e3e4d4980174ed8597956f7493d0a6bacaa..b57ea06524b00b1e2061a5dd68803464fcd1dfbd 100644 (file)
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -19,10 +19,12 @@
  * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-#include <config.h>
-
+#include "config.h"
 #include "empathy-client-factory.h"
 
+#include <tp-account-widgets/tpaw-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
+
 #include "empathy-tp-chat.h"
 #include "empathy-utils.h"
 
@@ -45,12 +47,8 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
 
   if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT))
     {
-      TpAccount *account;
-
-      account = tp_connection_get_account (conn);
-
       return TP_CHANNEL (empathy_tp_chat_new (
-            TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path,
+            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path,
             properties));
     }
 
@@ -96,6 +94,9 @@ empathy_client_factory_dup_account_features (TpSimpleClientFactory *factory,
   feature = TP_ACCOUNT_FEATURE_ADDRESSING;
   g_array_append_val (features, feature);
 
+  feature = TP_ACCOUNT_FEATURE_STORAGE;
+  g_array_append_val (features, feature);
+
   return features;
 }
 
@@ -147,6 +148,8 @@ empathy_client_factory_dup_contact_features (TpSimpleClientFactory *factory,
        * is already in the contact list. This feature is pretty cheap to
        * prepare as it doesn't prepare the full roster. */
       TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
+      TP_CONTACT_FEATURE_CONTACT_GROUPS,
+      TP_CONTACT_FEATURE_CLIENT_TYPES,
   };
 
   features = chainup->dup_contact_features (factory, connection);
@@ -274,6 +277,6 @@ empathy_client_factory_dup_contact_by_id_finish (
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_return_copy_pointer (self,
+  tpaw_implement_finish_return_copy_pointer (self,
       empathy_client_factory_dup_contact_by_id_async, g_object_ref);
 }