Added bug 90185 to changelog

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 563fe29..0be40ac 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -28,27 +28,45 @@
  */
 
 #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>
 
- static gboolean
+typedef struct {
+       gulong queue_handler;
+       gulong window_list_handler;
+       gulong get_password_handler;
+} MainSignalHandlers;
+
+static gboolean
 on_idle_exit_modest (gpointer data)
 {
+       MainSignalHandlers *handlers;
+
        /* 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);
+       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 ();
-
+       
        gdk_threads_leave ();
 
        return FALSE;
@@ -60,9 +78,11 @@ on_queue_empty (ModestMailOperationQueue *queue,
 {
        ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
-       /* Exit if the queue is empty and there are no more windows */
+       /* 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 */
        if (modest_window_mgr_num_windows (mgr) == 0)
-               g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, NULL, NULL);
+               g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
 }
 
 static void
@@ -73,7 +93,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, NULL, NULL);
+               g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
 }
 
 int
@@ -85,6 +105,7 @@ main (int argc, char *argv[])
         * command line.: */
        gboolean show_ui_without_top_application_method = FALSE;
        int retval  = 0;
+       MainSignalHandlers *handlers;
 
        if (argc >= 2) {
                if (strcmp (argv[1], "showui") == 0)
@@ -119,16 +140,27 @@ main (int argc, char *argv[])
                goto cleanup;
        }
 
-       /* Connect to the queue-emtpy signal */
-       g_signal_connect (modest_runtime_get_mail_operation_queue (),
-                         "queue-empty",
-                         G_CALLBACK (on_queue_empty),
-                         NULL);
-
-       g_signal_connect (modest_runtime_get_window_mgr (),
-                         "window-list-empty",
-                         G_CALLBACK (on_window_list_empty),
-                         NULL);
+       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,