diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-02-27 06:19:13 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-02-27 06:19:13 +0800 |
commit | a84e1e573eec373609ede78a56103dbab3da6046 (patch) | |
tree | 67c30a5ccd7918add574ead848ff69f5d0468e8f | |
parent | 79c219478f9ace0c2a767771def2c81ddc6e1a3a (diff) | |
parent | 08cf375e793f4f9255e10ca61850af279a07ce1a (diff) | |
download | gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar.gz gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar.bz2 gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar.lz gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar.xz gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.tar.zst gsoc2013-empathy-a84e1e573eec373609ede78a56103dbab3da6046.zip |
Merge branch 'show-assistant-611131'
-rw-r--r-- | src/empathy-accounts-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 89d7eb8a8..cf730fab2 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -145,6 +145,10 @@ connection_managers_prepare_cb ( { show_account_assistant (cm_mgr, assistant_destroy_cb); } + else if (!empathy_accounts_has_non_salut_accounts (account_mgr)) + { + show_account_assistant (cm_mgr, assistant_destroy_cb); + } else { if (assistant_destroy_cb) |