[empathy] avatar-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS



commit 7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Aug 18 12:29:27 2011 +0200

    avatar-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS
    
    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-avatar-chooser.c |    6 +-----
 libempathy/empathy-client-factory.c     |    3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 2d1c599..8e64e1f 100644
--- 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 37ad18f..56e1662 100644
--- 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;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]