[empathy: 2/8] Only launch empathy-accounts if needed

[Sjoerd Simons <sjoerds src gnome org>]

commit 8fb1b3a30ee4a9bc98087781cd6651cab8c4c96d
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Mon Mar 1 18:28:24 2010 +0000

    Only launch empathy-accounts if needed

 src/empathy.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index 1b5ad72..ef2f210 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);