Fixes NB#133657, set the proper parent to the account settings dialog. This could...

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index a5a33d6..adad0fd 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -510,9 +510,16 @@ show_wrong_password_dialog (TnyAccount *account,
 
                /* Create and show the dialog */
                if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+                       GtkWindow *parent;
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
                        ModestAccountSettingsDialog *dialog =
                                modest_account_protocol_get_account_settings_dialog (proto, modest_account_name);
-                       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), NULL);
+
+                       parent = modest_window_mgr_get_modal (mgr);
+                       if (!parent)
+                               parent = (GtkWindow *) modest_window_mgr_get_current_top (mgr);
+
+                       modest_window_mgr_set_modal (mgr, GTK_WINDOW (dialog), parent);
                        gtk_widget_show (GTK_WIDGET (dialog));
                }
        }
@@ -1154,27 +1161,31 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE ||
                 error->code == TNY_SERVICE_ERROR_CONNECT) {
                TnyDevice *device = modest_runtime_get_device ();
-
-               if (error->code == TNY_SERVICE_ERROR_CONNECT) {
-                       gboolean success;
-                       success = modest_account_mgr_get_server_account_username_has_succeeded (modest_runtime_get_account_mgr (),
-                                                                                               tny_account_get_id (account));
-                       if (success)
-                               goto end;
+               gboolean success;
+
+               /* If we get the connection error after establishing a
+                  proper connection then do not show the dialog as we
+                  are probably behind a firewall, or in a network
+                  with connection issues. We just keep this code to
+                  detect situations were the user does not enter the
+                  server info properly */
+               success = modest_account_mgr_get_server_account_username_has_succeeded (modest_runtime_get_account_mgr (),
+                                                                                       tny_account_get_id (account));
+
+               if (!success) {
+
+                       modest_platform_run_information_dialog (NULL, prompt, TRUE);
+
+                       /* Show the account dialog. Checking the online status
+                          allows us to minimize the number of times that we
+                          incorrectly show the dialog */
+                       if (tny_device_is_online (device))
+                               show_wrong_password_dialog (account,
+                                                           (error->code == TNY_SERVICE_ERROR_CONNECT) ? FALSE : TRUE);
+                       retval = TRUE;
                }
-
-               modest_platform_run_information_dialog (NULL, prompt, TRUE);
-
-               /* Show the account dialog. Checking the online status
-                  allows us to minimize the number of times that we
-                  incorrectly show the dialog */
-               if (tny_device_is_online (device))
-                       show_wrong_password_dialog (account,
-                                                   (error->code == TNY_SERVICE_ERROR_CONNECT) ? FALSE : TRUE);
-
-               retval = TRUE;
        }
- end:
+
        g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message);
 
        if (prompt)