X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=a42c16e674285708675ba09c193b3abb87cfb868;hp=b330ca2d5f9969b3f996255888192e7063c753ad;hb=7e60664f27f84e5caf4b80c591e03dfefc46d3f3;hpb=d55b4a5e61e0e58d861bb4c5efa007b81963fdb6

diff --git a/src/modest-main.c b/src/modest-main.c
index b330ca2..a42c16e 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -28,41 +28,56 @@
  */
 
 #include <config.h>
-
+#include <gdk/gdk.h>
+#include <string.h>
 #include <glib.h>
 #include <modest-runtime.h>
 #include <modest-init.h>
 #include "modest-platform.h"
-#include <gdk/gdk.h>
+#include "modest-ui-actions.h"
 #include <widgets/modest-main-window.h>
-#include <string.h>
 
 typedef struct {
 	gulong queue_handler;
 	gulong window_list_handler;
+	gulong get_password_handler;
 } MainSignalHandlers;
 
 static gboolean
 on_idle_exit_modest (gpointer data)
 {
 	MainSignalHandlers *handlers;
+	ModestMailOperationQueue *mail_op_queue;
 
 	/* Protect the Gtk calls */
 	gdk_threads_enter ();
-
-	/* Disconnect signals. Will be freed by the destroy notify */
-	handlers = (MainSignalHandlers *) data;
-	g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (), 
-				     handlers->queue_handler);
-	g_signal_handler_disconnect (modest_runtime_get_window_mgr (), 
-				     handlers->window_list_handler);
-
-	/* Wait for remaining tasks */
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	gtk_main_quit ();
-
+	mail_op_queue = modest_runtime_get_mail_operation_queue ();
+
+	if (modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
+
+		/* Disconnect signals. Will be freed by the destroy notify */
+		handlers = (MainSignalHandlers *) data;
+		g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (), 
+					     handlers->queue_handler);
+		g_signal_handler_disconnect (modest_runtime_get_window_mgr (), 
+					     handlers->window_list_handler);
+		g_signal_handler_disconnect (modest_runtime_get_account_store (), 
+					     handlers->get_password_handler);		
+		g_free (handlers);
+
+		/* Wait for remaining tasks */
+		while (gtk_events_pending ())
+			gtk_main_iteration ();
+		
+		gtk_main_quit ();
+	} else {
+		ModestMailOperation *mail_op;
+		mail_op = modest_mail_operation_new (NULL);
+		modest_mail_operation_queue_add (mail_op_queue, mail_op);
+		modest_mail_operation_shutdown (mail_op, modest_runtime_get_account_store ());
+		g_object_unref (mail_op);
+	}
+		
 	gdk_threads_leave ();
 
 	return FALSE;
@@ -78,7 +93,7 @@ on_queue_empty (ModestMailOperationQueue *queue,
 	   windows. We can exit as well if the main window is hidden
 	   and it's the only one */
 	if (modest_window_mgr_num_windows (mgr) == 0)
-		g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, g_free);
+		g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
 }
 
 static void
@@ -89,7 +104,7 @@ on_window_list_empty (ModestWindowMgr *window_mgr,
 
 	/* 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, g_free);
+		g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
 }
 
 int
@@ -136,20 +151,28 @@ main (int argc, char *argv[])
 		goto cleanup;
 	}
 
-	/* Connect to the queue-emtpy signal */
 	handlers = g_malloc0 (sizeof (MainSignalHandlers));
+	/* Connect to the "queue-emtpy" signal */
 	handlers->queue_handler = 
 		g_signal_connect (modest_runtime_get_mail_operation_queue (),
 				  "queue-empty",
 				  G_CALLBACK (on_queue_empty),
 				  handlers);
 
+	/* Connect to the "window-list-emtpy" signal */
 	handlers->window_list_handler = 
 		g_signal_connect (modest_runtime_get_window_mgr (),
 				  "window-list-empty",
 				  G_CALLBACK (on_window_list_empty),
 				  handlers);
 
+	/* Connect to the "password-requested" signal */
+	handlers->get_password_handler = 
+		g_signal_connect (modest_runtime_get_account_store (),
+				  "password_requested",
+				  G_CALLBACK (modest_ui_actions_on_password_requested),
+				  NULL);
+
 	/* 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.