From 7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 18 Aug 2011 12:29:27 +0200 Subject: [PATCH] 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 2d1c5994..8e64e1fe 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 37ad18ff..56e16629 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; } -- 2.39.2