* Fixes NB#85060, show the password dialog whenever the password is not defined...

pmo-trunk-r4594

diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c
index 3255109..f9ec0ed 100644 (file)
--- a/src/gnome/modest-main-window.c
+++ b/src/gnome/modest-main-window.c
@@ -415,12 +415,6 @@ connect_signals (ModestMainWindow *self)
        g_signal_connect (G_OBJECT(priv->msg_preview), "recpt-activated",
                          G_CALLBACK(modest_ui_actions_on_msg_recpt_activated), self);
 
-       /* Account store */
-       /* Emmitted by our TnyAccountStore::get_password_func() implementation,
-        * This is not a normal part of tinymail: */
-       g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "password_requested",
-                         G_CALLBACK (modest_ui_actions_on_password_requested), self);
-       
        /* Device */
        g_signal_connect (G_OBJECT(priv->online_toggle), "toggled",
                          G_CALLBACK(on_online_toggle_toggled), self);

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index e878ffb..9050341 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1051,13 +1051,6 @@ connect_signals (ModestMainWindow *self)
                                           "account_changed", 
                                           G_CALLBACK (on_account_changed),
                                           self);
-
-       priv->sighandlers = 
-               modest_signal_mgr_connect (priv->sighandlers,
-                                          G_OBJECT (modest_runtime_get_account_store()), 
-                                          "password_requested",
-                                          G_CALLBACK (modest_ui_actions_on_password_requested), 
-                                          self);
 }
 
 static void 
@@ -1334,7 +1327,7 @@ modest_main_window_new (void)
        helper->handler_id = g_signal_connect (G_OBJECT(self), "show",
                                               G_CALLBACK (modest_main_window_on_show), 
                                               helper);
-               
+       
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG);
        if (window_icon) {

diff --git a/src/modest-main.c b/src/modest-main.c
index 3214858..a42c16e 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -28,18 +28,19 @@
  */
 
 #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
@@ -60,12 +61,14 @@ on_idle_exit_modest (gpointer data)
                                             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 ();
                
-               g_free (handlers);
-               
                gtk_main_quit ();
        } else {
                ModestMailOperation *mail_op;
@@ -148,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.