diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-03-02 02:28:24 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-03-02 02:28:24 +0800 |
| commit | 8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d (patch) | |
| tree | 7c78696359d7058c368feb2c3773a7403a38420e /src | |
| parent | 8254654ccb030f05cd72f1c011d02c4de8816589 (diff) | |
| download | gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar.gz gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar.bz2 gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar.lz gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar.xz gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.tar.zst gsoc2013-empathy-8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d.zip | |
Only launch empathy-accounts if needed
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c index 1b5ad7200..ef2f2106e 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -69,6 +69,8 @@ #include <libempathy-gtk/empathy-location-manager.h> #include "empathy-main-window.h" +#include "empathy-import-mc4-accounts.h" +#include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" #include "empathy-call-window.h" @@ -380,7 +382,11 @@ account_manager_ready_cb (GObject *source_object, /* if current state is Offline, then put it online */ empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE); - show_accounts_ui (gdk_screen_get_default (), TRUE); + /* Pop up the accounts dialog if it's needed (either when we don't have any + * non-salut accounts yet or when we haven't imported mc4 accounts yet */ + if (!empathy_accounts_has_non_salut_accounts (manager) + || !empathy_import_mc4_has_imported ()) + show_accounts_ui (gdk_screen_get_default (), TRUE); g_object_unref (idle); g_object_unref (connectivity); |