diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-06-26 21:49:13 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-07-01 21:19:40 +0800 |
| commit | dd54eb8205f1cd12267af127dab79297c0edc469 (patch) | |
| tree | 3655199cf98837b6f46c45bf4aba813458a50077 /src/empathy-status-icon.c | |
| parent | f3d6fcb79762ff484c8b7221cec1079b0dad7fb7 (diff) | |
| download | gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar.gz gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar.bz2 gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar.lz gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar.xz gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.tar.zst gsoc2013-empathy-dd54eb8205f1cd12267af127dab79297c0edc469.zip | |
Port the main of empathy to EmpathyAccount
Diffstat (limited to 'src/empathy-status-icon.c')
| -rw-r--r-- | src/empathy-status-icon.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index a4b01b7c0..f6c63c537 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -306,14 +306,20 @@ status_icon_set_visibility (EmpathyStatusIcon *icon, empathy_window_iconify (priv->window, priv->icon); } else { GList *accounts; + GList *l; + gboolean one_enabled = FALSE; empathy_window_present (GTK_WINDOW (priv->window), TRUE); /* Show the accounts dialog if there is no enabled accounts */ - accounts = mc_accounts_list_by_enabled (TRUE); - if (accounts) { - mc_accounts_list_free (accounts); - } else { + accounts = empathy_account_manager_dup_accounts (priv->account_manager); + for (l = accounts ; l != NULL ; l = g_list_next (l)) { + one_enabled = empathy_account_is_enabled (EMPATHY_ACCOUNT (l->data)) + || one_enabled; + g_object_unref (l->data); + } + g_list_free (accounts); + if (!one_enabled) { DEBUG ("No enabled account, Showing account dialog"); empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL); } @@ -484,7 +490,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon) static void status_icon_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, |