diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-18 18:29:27 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-19 15:26:26 +0800 |
| commit | 7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0 (patch) | |
| tree | 558e56b0f228a78c6619a31a60c3727f63748326 | |
| parent | 5a3861854b566ba034bf9ddc2fd581185dcc2ef1 (diff) | |
| download | gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar.gz gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar.bz2 gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar.lz gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar.xz gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.tar.zst gsoc2013-empathy-7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0.zip | |
avatar-chooser: rely on the factory to prepare TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS
https://bugzilla.gnome.org/show_bug.cgi?id=656831
| -rw-r--r-- | libempathy-gtk/empathy-avatar-chooser.c | 6 | ||||
| -rw-r--r-- | 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 2d1c59943..8e64e1fe2 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 37ad18ff5..56e16629f 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; } |