From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 26 Jan 2009 09:39:34 +0000 (+0000)
Subject: Avoid showing "main window" below the account wizard (fixes NB#93577).
X-Git-Tag: git_migration_finished~718
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=02aac9a2616f3ad4475da0daa7eb1f6ebd02a10d

Avoid showing "main window" below the account wizard (fixes NB#93577).

pmo-trunk-r7287
---

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 95b920a..e5ed944 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -223,14 +223,38 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
 	wizard = GTK_WINDOW (modest_platform_get_account_settings_wizard ());
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (wizard), (GtkWindow *) win);
 
+#ifndef MODEST_TOOLKIT_HILDON2
 	/* always present a main window in the background 
 	 * we do it here, so we cannot end up with two wizards (as this
 	 * function might be called in modest_window_mgr_get_main_window as well */
-	if (!win) 
+	if (!win)
 		win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
 							 TRUE);  /* create if not existent */
+#else
+	if (!win) {
+		GList *window_list;
+		ModestWindowMgr *mgr;
+
+		mgr = modest_runtime_get_window_mgr ();
+
+		window_list = modest_window_mgr_get_window_list (mgr);
+		if (window_list == NULL) {
+			win = MODEST_WINDOW (modest_accounts_window_new ());
+			modest_window_mgr_register_window (mgr, win, NULL);
+			gtk_widget_show_all (GTK_WIDGET (win));
+
+			win = MODEST_WINDOW (modest_folder_window_new (NULL));
+			modest_window_mgr_register_window (mgr, win, NULL);
 
-	gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+			gtk_widget_show_all (GTK_WIDGET (win));
+		} else {
+			g_list_free (window_list);
+		}
+	}
+#endif
+
+	if (win)
+		gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
 
 	/* make sure the mainwindow is visible. We need to present the
 	   wizard again to give it the focus back. show_all are needed