avatar-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

https://bugzilla.gnome.org/show_bug.cgi?id=656831

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 2d1c599431e66807455cb3eed5b7f3605ea7221d..8e64e1fe260ac18b8a078029ab01b27b4fffedd4 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -143,11 +143,7 @@ avatar_chooser_set_connection (EmpathyAvatarChooser *self,
   tp_clear_object (&self->priv->connection);
 
   if (connection != NULL)
-    {
-      GQuark features[] = { TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS, 0 };
-      self->priv->connection = g_object_ref (connection);
-      tp_proxy_prepare_async (self->priv->connection, features, NULL, NULL);
-    }
+    self->priv->connection = g_object_ref (connection);
 }
 
 static void

diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 37ad18ff5c17271d691e1dfdac5f88cb1458ff25..56e16629f47251cea5497dd58e805b9e1661e554 100644 (file)
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -140,6 +140,9 @@ empathy_client_factory_dup_connection_features (TpSimpleClientFactory *factory,
   feature = TP_CONNECTION_FEATURE_CAPABILITIES;
   g_array_append_val (features, feature);
 
+  feature = TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS;
+  g_array_append_val (features, feature);
+
   return features;
 }