X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=ed753dd48370395a29daaae46ee581cd0ffc967e;hp=1d6bde686b04c78789545b5d59f55a14ce2e12c4;hb=22a2aa923978b9bdcdb9d1fb6eebc08729a7a0e9;hpb=88a7d1cf118e00bd430bbb4432da92717cb2e02b

diff --git a/src/modest-main.c b/src/modest-main.c
index 1d6bde6..ed753dd 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -59,7 +59,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;
@@ -95,6 +96,9 @@ on_queue_empty (ModestMailOperationQueue *queue,
 {
 	ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
+	if (!modest_runtime_get_allow_shutdown ())
+		return;
+
 	/* Exit if the queue is empty and there are no more
 	   windows. We can exit as well if the main window is hidden
 	   and it's the only one */
@@ -108,6 +112,9 @@ on_window_list_empty (ModestWindowMgr *window_mgr,
 {
 	ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
 
+	if (!modest_runtime_get_allow_shutdown ())
+		return;
+
 	/* Exit if there are no more windows and the queue is empty */
 	if (modest_mail_operation_queue_num_elements (queue) == 0)
 		g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
@@ -120,26 +127,27 @@ main (int argc, char *argv[])
 	 * because we wait for the top_application D-Bus method to
 	 * be called. But that's annoying when starting from the
 	 * command line.: */
-	gboolean show_ui_without_top_application_method = FALSE;
 	int retval  = 0;
 	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;
-
-	if (!show_ui_without_top_application_method) {
-		g_print ("modest: use 'modest showui' to start from cmdline  with UI\n");
+	if (!show_ui) {
+		g_print ("modest: use 'modest -s' to start from cmdline  with UI\n");
 	}
 
 	if (!g_thread_supported())
@@ -166,6 +174,10 @@ main (int argc, char *argv[])
 		goto cleanup;
 	}
 
+	/* Create the account store & launch send queues */
+	acc_store = modest_runtime_get_account_store ();
+	modest_tny_account_store_start_send_queues (acc_store);
+
 	handlers = g_malloc0 (sizeof (MainSignalHandlers));
 	/* Connect to the "queue-emtpy" signal */
 	handlers->queue_handler =
@@ -183,20 +195,23 @@ main (int argc, char *argv[])
 
 	/* Connect to the "password-requested" signal */
 	handlers->get_password_handler =
-		g_signal_connect (modest_runtime_get_account_store (),
+		g_signal_connect (acc_store,
 				  "password_requested",
 				  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.
 	 * The UI will be shown later (or just after starting if no otehr D-Bus method was used),
 	 * when we receive the "top_application" D-Bus method.
 	 */
-	if (show_ui_without_top_application_method) {
+	if (show_ui) {
 		ModestWindow *window;
-		ModestWindowMgr *mgr;
 
 		mgr = modest_runtime_get_window_mgr();
 		window = modest_window_mgr_show_initial_window (mgr);