Fixes NB#125952, "lose changes confirmation dialog" is now modal do easysetup wizard...

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index c7493bc..df05c43 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -53,6 +53,7 @@
 #include <modest-window-priv.h>
 #include "modest-text-utils.h"
 #include "modest-tny-account.h"
+#include "modest-account-protocol.h"
 
 typedef enum {
        EDIT_MODE_COMMAND_MOVE = 1,
@@ -319,7 +320,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        priv->top_vbox = gtk_vbox_new (0, FALSE);
        top_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (top_alignment),
-                                  0, 0,
+                                  HILDON_MARGIN_HALF, 0,
                                   HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
 
        gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view);
@@ -466,7 +467,32 @@ static void
 edit_account (GtkButton *button,
              ModestFolderWindow *self)
 {
-
+       const gchar *account_name;
+
+       account_name = modest_window_get_active_account ((ModestWindow *) self);
+       if (modest_ui_actions_check_for_active_account ((ModestWindow *) self, account_name)) {
+               /* Show the account settings dialog */
+               ModestAccountProtocol *proto;
+               ModestProtocolType proto_type;
+
+               /* Get proto */
+               proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (),
+                                                                   account_name);
+               proto = (ModestAccountProtocol *)
+                       modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+                                                                      proto_type);
+
+               /* Create and show the dialog */
+               if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
+                       ModestAccountSettingsDialog *dialog =
+                               modest_account_protocol_get_account_settings_dialog (proto, account_name);
+                       modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+                                                    (GtkWindow *) dialog,
+                                                    (GtkWindow *) self);
+                       gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE);
+                       gtk_widget_show (GTK_WIDGET (dialog));
+               }
+       }
 }
 
 static void
@@ -497,8 +523,12 @@ setup_menu (ModestFolderWindow *self)
                                           APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
 
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_account"), NULL,
-                                          APP_MENU_CALLBACK (edit_account),
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+                                          dngettext(GETTEXT_PACKAGE,
+                                                    "mcen_me_edit_account",
+                                                    "mcen_me_edit_accounts",
+                                                    1),
+                                          NULL, APP_MENU_CALLBACK (edit_account),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
 }