X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=e84b2de565b6d4d12162e793b4bbc281bc383894;hp=6165b450a1156883c4cd8e56130d3969add78214;hb=fc741ebc372d1c8d4756641b96cb7cc37f986e47;hpb=fea9cf6f2c8f608c8e2edb38244b2235f1f66766

diff --git a/src/modest-main.c b/src/modest-main.c
index 6165b45..e84b2de 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -63,7 +63,8 @@ on_idle_exit_modest (gpointer data)
 	gdk_threads_enter ();
 	mail_op_queue = modest_runtime_get_mail_operation_queue ();
 
-	if (modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
+	if (modest_tny_account_store_is_shutdown (modest_runtime_get_account_store ()) &&
+	    modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
 
 		/* Disconnect signals. Will be freed by the destroy notify */
 		handlers = (MainSignalHandlers *) data;
@@ -142,17 +143,20 @@ main (int argc, char *argv[])
 	MainSignalHandlers *handlers;
 	ModestTnyAccountStore *acc_store;
 
-	GError *error;
+	GError *error = NULL;
 	GOptionContext *context;
 
+	ModestWindowMgr *mgr;
+
 	context = g_option_context_new ("- Modest email client");
 	g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
 		g_print ("option parsing failed: %s\n", error->message);
+		g_option_context_free (context);
 		exit (1);
 	}
-
+	g_option_context_free (context);
 
 	show_ui_without_top_application_method = show_ui;
 
@@ -211,6 +215,10 @@ main (int argc, char *argv[])
 				  G_CALLBACK (modest_ui_actions_on_password_requested),
 				  NULL);
 
+	/* Create cached windows */
+	mgr = modest_runtime_get_window_mgr ();
+	modest_window_mgr_create_caches (mgr);
+
 	/* Usually, we only show the UI when we get the "top_application" D-Bus method.
 	 * This allows modest to start via D-Bus activation to provide a service,
 	 * without showing the UI.
@@ -219,7 +227,6 @@ main (int argc, char *argv[])
 	 */
 	if (show_ui_without_top_application_method) {
 		ModestWindow *window;
-		ModestWindowMgr *mgr;
 
 		modest_runtime_set_allow_shutdown (TRUE);
 		mgr = modest_runtime_get_window_mgr();