X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;fp=src%2Fmaemo%2Fmodest-main-window.c;h=0ab62cfcda6cf091ab2a2bfc28e13b53af07a4af;hb=21ffdb4ebcc04396c77fd80e586b1258b5048069;hp=d61565f63e284d9d4d09bf75b8d879eb6760e7d3;hpb=f3b6305ffd1aeebad570acf56fbb51f697766965;p=modest

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index d61565f..0ab62cf 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -779,6 +779,12 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
 	
 	restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
 
+	/* The UI spec wants us to show a connection dialog when the application is 
+	 * started by the user, if there is no connection.
+	 * Do this before showing the account wizard, 
+	 * because wizard needs a connection to discover capabilities. */
+	 modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
+	 
 	/* Check if accounts exist and show the account wizard if not */
 	gboolean accounts_exist = 
 		modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
@@ -798,10 +804,6 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
 		gtk_action_set_visible (send_receive_all, g_slist_length (accounts));
 		modest_account_mgr_free_account_names (accounts);
 	}
-
-	/* The UI spec wants us to show a connection dialog when the application is 
-	 * started by the user, if there is no connection: */
-	 modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
 }
 
 ModestWindow *