Merge commit 'upstream/master' into mc5

[empathy.git] / libempathy-gtk / empathy-account-chooser.c

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 34ebc7eac40181df36caef69013cbf6a079515c3..7c6f52fa52c1c673d7c41a8a33420b6c47caa2c1 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -29,8 +29,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <libmissioncontrol/mission-control.h>
-
 #include <libempathy/empathy-account-manager.h>
 #include <libempathy/empathy-utils.h>
 
@@ -617,7 +615,7 @@ account_chooser_update_iter (EmpathyAccountChooser *chooser,
                            COL_ACCOUNT_POINTER, &account,
                            -1);
 
-       icon_name = empathy_icon_name_from_account (account);
+       icon_name = empathy_account_get_icon_name (account);
        if (priv->filter) {
                is_enabled = priv->filter (account, priv->filter_data);
        }
@@ -779,7 +777,7 @@ empathy_account_chooser_filter_is_connected (EmpathyAccount *account,
 {
        TpConnectionStatus  status;
 
-       g_object_get (account, "status", &status, NULL);
+       g_object_get (account, "connection-status", &status, NULL);
 
        return status == TP_CONNECTION_STATUS_CONNECTED;
 }