From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 19 Aug 2011 10:20:02 +0000 (+0200)
Subject: contact-chooser: use tp_connection_get_account()
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b9582cf3bee2de40dc4dbb9b73e0c2d998e25875

contact-chooser: use tp_connection_get_account()

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

diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index a4a0aad1..7faee3e0 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -201,7 +201,7 @@ get_contacts_cb (TpConnection *connection,
   if (n_contacts != 1)
     return;
 
-  account = g_object_get_data (G_OBJECT (connection), "account");
+  account = tp_connection_get_account (connection);
 
   store = tpf_persona_store_new (account);
   personas = GEE_SET (
@@ -252,10 +252,6 @@ add_temporary_individuals (EmpathyContactChooser *self,
       if (conn == NULL)
         continue;
 
-      /* One day we'll have tp_connection_get_account()... */
-      g_object_set_data_full (G_OBJECT (conn), "account",
-          g_object_ref (account), g_object_unref);
-
       tp_connection_get_contacts_by_id (conn, 1, &id, G_N_ELEMENTS (features),
           features, get_contacts_cb, self->priv->add_temp_ctx, NULL,
           G_OBJECT (self));