GNOME version compiles again. It does not link yet though, because there are some...
authorSergio Villar Senin <svillar@igalia.com>
Mon, 29 Dec 2008 13:15:14 +0000 (13:15 +0000)
committerSergio Villar Senin <svillar@igalia.com>
Mon, 29 Dec 2008 13:15:14 +0000 (13:15 +0000)
pmo-trunk-r7031

20 files changed:
src/gnome/Makefile.am
src/gnome/modest-account-assistant.c
src/gnome/modest-account-settings-dialog.c [deleted file]
src/gnome/modest-account-view-window.c
src/gnome/modest-default-account-settings-dialog.c [new file with mode: 0644]
src/gnome/modest-gnome-global-settings-dialog.c
src/gnome/modest-main-window.c
src/gnome/modest-msg-edit-window.c
src/gnome/modest-msg-view-window.c
src/gnome/modest-platform.c
src/gnome/modest-store-widget.c
src/gnome/modest-store-widget.h
src/gnome/modest-transport-widget.c
src/gnome/modest-transport-widget.h
src/maemo/modest-default-account-settings-dialog.c
src/modest-protocol-registry.h
src/widgets/modest-folder-view.c
src/widgets/modest-msg-edit-window-ui.h
src/widgets/modest-ui-constants.h
src/widgets/modest-validating-entry.c

index e773362..7b42315 100644 (file)
@@ -26,7 +26,7 @@ PIXMAP_FILES=\
 libmodest_ui_la_SOURCES=              \
        modest-account-assistant.c    \
        modest-account-assistant.h    \
-       modest-account-settings-dialog.c \
+       modest-default-account-settings-dialog.c \
        modest-account-view-window.c  \
        modest-address-book.c         \
        modest-msg-edit-window.c      \
index ad7e7de..233db19 100644 (file)
@@ -37,7 +37,7 @@
 #include "modest-text-utils.h"
 #include "modest-runtime.h"
 #include "modest-utils.h"
-#include <modest-protocol-info.h>
+#include "modest-protocol-registry.h"
 #include "modest-platform.h"
 
 #include <string.h>
@@ -165,16 +165,26 @@ on_assistant_changed(GtkWidget* widget, ModestAccountAssistant* assistant)
 static void
 on_incoming_security_changed(GtkWidget* widget, ModestAccountAssistant* assistant)
 {
-       ModestAccountAssistantPrivate* priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(assistant);
-       ModestConnectionProtocol protocol_security_incoming;
+       ModestAccountAssistantPrivate* priv;
+       ModestProtocolType protocol_id;
+       ModestProtocol *protocol_security_incoming;
        const gchar *name;
+       ModestProtocolRegistry *registry;
+       gboolean is_secure;
 
-       g_return_if_fail (priv != NULL);
-       name = (const gchar *) modest_combo_box_get_active_id  (MODEST_COMBO_BOX (priv->store_security_combo));
-       protocol_security_incoming = modest_protocol_info_get_transport_store_protocol (name);
+       g_return_if_fail (MODEST_IS_ACCOUNT_ASSISTANT (assistant));
 
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->store_secure_auth), modest_protocol_info_is_secure (protocol_security_incoming));
-       gtk_widget_set_sensitive (priv->store_secure_auth, !modest_protocol_info_is_secure (protocol_security_incoming));
+       priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(assistant);
+       registry = modest_runtime_get_protocol_registry ();
+       name = (const gchar *) modest_combo_box_get_active_id  (MODEST_COMBO_BOX (priv->store_security_combo));
+       protocol_security_incoming = modest_protocol_registry_get_protocol_by_name (registry, 
+                                                                                   MODEST_PROTOCOL_REGISTRY_SECURE_PROTOCOLS,
+                                                                                   name);
+       protocol_id = modest_protocol_get_type_id (protocol_security_incoming);
+       is_secure = modest_protocol_registry_protocol_type_is_secure (registry, protocol_id);
+
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->store_secure_auth), is_secure);
+       gtk_widget_set_sensitive (priv->store_secure_auth, !is_secure);
        
        on_assistant_changed (widget, assistant);
 }
@@ -504,7 +514,8 @@ on_sending_combo_box_changed (GtkComboBox *combo, ModestAccountAssistant *self)
 {
        ModestAccountAssistantPrivate *priv;
        gchar *chosen;
-       
+       ModestProtocol *proto;
+
        priv = MODEST_ACCOUNT_ASSISTANT_GET_PRIVATE(self);
 
        chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX(combo));
@@ -512,8 +523,11 @@ on_sending_combo_box_changed (GtkComboBox *combo, ModestAccountAssistant *self)
        if (priv->transport_widget)
                gtk_container_remove (GTK_CONTAINER(priv->transport_holder),
                                      priv->transport_widget);
-       priv->transport_widget =
-               modest_transport_widget_new (modest_protocol_info_get_transport_store_protocol(chosen));
+
+       proto = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+                                                              MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS,
+                                                              chosen);
+       priv->transport_widget = modest_transport_widget_new (modest_protocol_get_type_id (proto));
 
        gtk_container_add (GTK_CONTAINER(priv->transport_holder),
                           priv->transport_widget);
@@ -712,19 +726,20 @@ get_email (ModestAccountAssistant *self)
  * somewhere else
  */
 static gchar*
-get_account_uri (ModestTransportStoreProtocol proto, const gchar* path)
+get_account_uri (ModestProtocolType proto, const gchar* path)
 {
        CamelURL *url;
        gchar *uri;
        
-       switch (proto) {
-       case MODEST_PROTOCOL_STORE_MBOX:
-               url = camel_url_new ("mbox:", NULL); break;
-       case MODEST_PROTOCOL_STORE_MAILDIR:
-               url = camel_url_new ("maildir:", NULL); break;
-       default:
-               g_return_val_if_reached (NULL);
+       if (proto == modest_protocol_registry_get_mbox_type_id ()) {
+               url = camel_url_new ("mbox:", NULL);
+       } else {
+               if (proto == modest_protocol_registry_get_maildir_type_id ())
+                       url = camel_url_new ("maildir:", NULL);
+               else
+                       g_return_val_if_reached (NULL);
        }
+
        camel_url_set_path (url, path);
        uri = camel_url_to_string (url, 0);
        camel_url_free (url);
@@ -733,15 +748,24 @@ get_account_uri (ModestTransportStoreProtocol proto, const gchar* path)
 }
 
 static gchar*
-get_new_server_account_name (ModestAccountMgr* acc_mgr, ModestTransportStoreProtocol proto,
-                            const gchar* username, const gchar *servername)
+get_new_server_account_name (ModestAccountMgr* acc_mgr, 
+                            ModestProtocolType proto_id,
+                            const gchar *username, 
+                            const gchar *servername)
 {
        gchar *name;
+       const gchar *proto_name;
        gint  i = 0;
-       
+       ModestProtocolRegistry *registry;
+       ModestProtocol *proto;
+
+       registry = modest_runtime_get_protocol_registry ();
+       proto = modest_protocol_registry_get_protocol_by_type (registry, proto_id);
+       proto_name = modest_protocol_get_name (proto);
+
        while (TRUE) {
-               name = g_strdup_printf ("%s:%d",
-                                       modest_protocol_info_get_transport_store_protocol_name(proto), i++);
+               name = g_strdup_printf ("%s:%d", proto_name, i++);
+
                if (modest_account_mgr_account_exists (acc_mgr, name, TRUE))
                        g_free (name);
                else
@@ -820,34 +844,30 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
        return TRUE;
 }
 
-static gint get_serverport_incoming(ModestTransportStoreProtocol protocol,
-                                    ModestConnectionProtocol security)
+static gint 
+get_serverport_incoming(ModestProtocolType protocol,
+                       ModestProtocolType security)
 {
        int serverport_incoming = 0;
-               /* We don't check for SMTP here as that is impossible for an incoming server. */
-               if (protocol == MODEST_PROTOCOL_STORE_IMAP) {
-                       switch (security) {
-                       case MODEST_PROTOCOL_CONNECTION_NORMAL:
-                       case MODEST_PROTOCOL_CONNECTION_TLS:
-                       case MODEST_PROTOCOL_CONNECTION_TLS_OP:
-                               serverport_incoming = 143;
-                               break;
-                       case MODEST_PROTOCOL_CONNECTION_SSL:
-                               serverport_incoming = 993;
-                               break;
-                       }
-               } else if (protocol == MODEST_PROTOCOL_STORE_POP) {
-                       switch (security) {
-                       case MODEST_PROTOCOL_CONNECTION_NORMAL:
-                       case MODEST_PROTOCOL_CONNECTION_TLS:
-                       case MODEST_PROTOCOL_CONNECTION_TLS_OP:
-                               serverport_incoming = 110;
-                               break;
-                       case MODEST_PROTOCOL_CONNECTION_SSL:
-                               serverport_incoming = 995;
-                               break;
-                       }
+
+       /* We don't check for SMTP here as that is impossible for an incoming server. */
+       if ((security == modest_protocol_registry_get_none_connection_type_id ()) ||
+           (security == modest_protocol_registry_get_tls_connection_type_id ()) ||
+           (security == modest_protocol_registry_get_tlsop_connection_type_id ())) {
+
+               if (protocol == MODEST_PROTOCOLS_STORE_IMAP) {
+                       serverport_incoming = 143;
+               } else if (protocol == MODEST_PROTOCOLS_STORE_POP) {
+                       serverport_incoming = 110;
+               }
+       } else if (security == modest_protocol_registry_get_ssl_connection_type_id ()) {
+               if (protocol == MODEST_PROTOCOLS_STORE_IMAP) {
+                       serverport_incoming = 993;
+               } else if  (protocol == MODEST_PROTOCOLS_STORE_POP) {
+                       serverport_incoming = 995;
                }
+       }
+
        return serverport_incoming;
 }
 
@@ -855,11 +875,11 @@ static GList*
 check_for_supported_auth_methods (ModestAccountAssistant* self)
 {
        GError *error = NULL;
-       ModestTransportStoreProtocol protocol;
+       ModestProtocolType protocol;
        const gchar* hostname;
        const gchar* username;
        gchar *store_protocol_name, *store_security_name;
-       ModestConnectionProtocol security_protocol;
+       ModestProtocolType security_protocol;
        int port_num; 
        GList *list_auth_methods;
        ModestAccountAssistantPrivate *priv;
@@ -882,7 +902,7 @@ check_for_supported_auth_methods (ModestAccountAssistant* self)
                GList* list = NULL;
                GList* method;
                for (method = list_auth_methods; method != NULL; method = g_list_next(method)) {
-                       ModestAuthProtocol auth = (ModestAuthProtocol) (GPOINTER_TO_INT(method->data));
+                       ModestProtocolType auth = (ModestProtocolType) (GPOINTER_TO_INT(method->data));
                        if (modest_protocol_info_auth_is_secure(auth)) {
                                list = g_list_append(list, GINT_TO_POINTER(auth));
                        }
@@ -900,15 +920,15 @@ check_for_supported_auth_methods (ModestAccountAssistant* self)
        return NULL;
 }
 
-static ModestAuthProtocol check_first_supported_auth_method(ModestAccountAssistant* self)
+static ModestProtocolType check_first_supported_auth_method(ModestAccountAssistant* self)
 {
-       ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_PASSWORD;
+       ModestProtocolType result = MODEST_PROTOCOLS_AUTH_PASSWORD;
 
        GList* methods = check_for_supported_auth_methods(self);
        if (methods)
        {
                /* Use the first one: */
-               result = (ModestAuthProtocol) (GPOINTER_TO_INT(methods->data));
+               result = (ModestProtocolType) (GPOINTER_TO_INT(methods->data));
                g_list_free(methods);
        }
 
@@ -929,9 +949,9 @@ save_to_settings (ModestAccountAssistant *self)
        const gchar *username, *password;
        gchar *store_hostname, *transport_hostname;
        guint store_port, transport_port;
-       ModestTransportStoreProtocol store_protocol, transport_protocol;
-       ModestConnectionProtocol store_security, transport_security;
-       ModestAuthProtocol store_auth_protocol, transport_auth_protocol;
+       ModestProtocolType store_protocol, transport_protocol;
+       ModestProtocolType store_security, transport_security;
+       ModestProtocolType store_auth_protocol, transport_auth_protocol;
        ModestServerAccountSettings *store_settings, *transport_settings;
        const gchar *fullname, *email_address;
 
@@ -943,9 +963,9 @@ save_to_settings (ModestAccountAssistant *self)
        /* Note: We need something as default for the ModestTransportStoreProtocol* values, 
         * or modest_account_mgr_add_server_account will fail. */
        store_port = 0;
-       store_protocol = MODEST_PROTOCOL_STORE_POP;
-       store_security = MODEST_PROTOCOL_CONNECTION_NORMAL;
-       store_auth_protocol = MODEST_PROTOCOL_AUTH_NONE;
+       store_protocol = MODEST_PROTOCOLS_STORE_POP;
+       store_security = MODEST_PROTOCOLS_CONNECTION_NONE;
+       store_auth_protocol = MODEST_PROTOCOLS_AUTH_NONE;
 
        /* Use custom pages because no preset was specified: */
        store_hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->store_server_widget) ));                
@@ -957,10 +977,11 @@ save_to_settings (ModestAccountAssistant *self)
         * If secure authentication is checked, require one of the secure methods during 
         * connection: SSL, TLS, CRAM-MD5 etc. */
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->store_secure_auth)) &&
-           !modest_protocol_info_is_secure(store_security)) {
+           !modest_protocol_registry_protocol_type_is_secure(modest_runtime_get_protocol_registry (),
+                                                             store_security)) {
                store_auth_protocol = check_first_supported_auth_method (self);
        } else {
-               store_auth_protocol = MODEST_PROTOCOL_AUTH_PASSWORD;
+               store_auth_protocol = MODEST_PROTOCOLS_AUTH_PASSWORD;
        }
 
        /* now we store the store account settings */
@@ -979,13 +1000,13 @@ save_to_settings (ModestAccountAssistant *self)
        
        /* Outgoing server: */
        transport_hostname = NULL;
-       transport_protocol = MODEST_PROTOCOL_STORE_POP;
-       transport_security = MODEST_PROTOCOL_CONNECTION_NORMAL;
-       transport_auth_protocol = MODEST_PROTOCOL_AUTH_NONE;
+       transport_protocol = MODEST_PROTOCOLS_STORE_POP;
+       transport_security = MODEST_PROTOCOLS_CONNECTION_NONE;
+       transport_auth_protocol = MODEST_PROTOCOLS_AUTH_NONE;
        transport_port = 0;
        
        transport_hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->transport_server_widget) ));
-       transport_protocol = MODEST_PROTOCOL_TRANSPORT_SMTP; /* It's always SMTP for outgoing. */
+       transport_protocol = MODEST_PROTOCOLS_TRANSPORT_SMTP; /* It's always SMTP for outgoing. */
        transport_security = modest_protocol_info_get_connection_protocol (modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->transport_security_combo)));
        transport_auth_protocol = modest_protocol_info_get_auth_protocol (modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->transport_secure_auth_combo)));
            
diff --git a/src/gnome/modest-account-settings-dialog.c b/src/gnome/modest-account-settings-dialog.c
deleted file mode 100644 (file)
index 9dedb33..0000000
+++ /dev/null
@@ -1,1598 +0,0 @@
-/* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of the Nokia Corporation nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include "widgets/modest-account-settings-dialog.h"
-#include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
-
-#include "widgets/modest-serversecurity-combo-box.h"
-#include "widgets/modest-secureauth-combo-box.h"
-#include "widgets/modest-validating-entry.h"
-#include "widgets/modest-retrieve-combo-box.h"
-#include "widgets/modest-limit-retrieve-combo-box.h"
-#include "modest-text-utils.h"
-#include "modest-account-mgr.h"
-#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
-#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
-#include "modest-protocol-info.h"
-/* #include "maemo/modest-connection-specific-smtp-window.h" */
-/* #include "maemo/modest-signature-editor-dialog.h" */
-#include <modest-utils.h>
-#include <modest-platform.h>
-/* #include "maemo/modest-maemo-utils.h" */
-#include "widgets/modest-ui-constants.h"
-#include <tny-account.h>
-#include <tny-status.h>
-
-#include <gconf/gconf-client.h>
-#include <string.h> /* For strlen(). */
-
-/* Include config.h so that _() works: */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define PORT_MIN 1
-#define PORT_MAX 65535
-
-G_DEFINE_TYPE (ModestAccountSettingsDialog, modest_account_settings_dialog, GTK_TYPE_DIALOG);
-
-static void
-enable_buttons (ModestAccountSettingsDialog *self);
-
-static gboolean
-save_configuration (ModestAccountSettingsDialog *dialog);
-
-static const gchar * null_means_empty (const gchar * str);
-
-static const gchar *
-null_means_empty (const gchar * str)
-{
-       return str ? str : "";
-}
-
-
-static void
-modest_account_settings_dialog_get_property (GObject *object, guint property_id,
-                                                                                                                       GValue *value, GParamSpec *pspec)
-{
-       switch (property_id) {
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-       }
-}
-
-static void
-modest_account_settings_dialog_set_property (GObject *object, guint property_id,
-                                                                                                                       const GValue *value, GParamSpec *pspec)
-{
-       switch (property_id) {
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-       }
-}
-
-static void
-modest_account_settings_dialog_dispose (GObject *object)
-{
-       if (G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->dispose)
-               G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->dispose (object);
-}
-
-static void
-modest_account_settings_dialog_finalize (GObject *object)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (object);
-       
-       if (self->account_name)
-               g_free (self->account_name);
-               
-       if (self->original_account_title)
-               g_free (self->original_account_title);
-               
-       if (self->account_manager)
-               g_object_unref (G_OBJECT (self->account_manager));
-               
-       if (self->signature_dialog)
-               gtk_widget_destroy (self->signature_dialog);
-
-       if (self->settings) {
-               g_object_unref (self->settings);
-               self->settings = NULL;
-       }
-       
-       G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
-}
-
-static void
-on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data);
-
-static void
-on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data);
-
-static void
-on_modified_combobox_changed (GtkComboBox *widget, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       self->modified = TRUE;
-}
-
-static void
-on_modified_entry_changed (GtkEditable *editable, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       self->modified = TRUE;
-}
-
-static void
-on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       self->modified = TRUE;
-}
-
-static void
-on_modified_spin_button_changed (GtkSpinButton *spin_button, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       gint value = gtk_spin_button_get_value_as_int (spin_button);
-
-       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, value > 0);
-       self->modified = TRUE;
-}
-
-/* Set a modified boolean whenever the widget is changed, 
- * so we can check for it later.
- */
-static void
-connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget)
-{
-       if (GTK_SPIN_BUTTON (widget)) {
-               g_signal_connect (G_OBJECT (widget), "value_changed",
-                       G_CALLBACK (on_modified_spin_button_changed), self);
-       }
-       else if (GTK_IS_ENTRY (widget)) {
-               g_signal_connect (G_OBJECT (widget), "changed",
-                       G_CALLBACK (on_modified_entry_changed), self);
-       } else if (GTK_IS_COMBO_BOX (widget)) {
-               g_signal_connect (G_OBJECT (widget), "changed",
-                       G_CALLBACK (on_modified_combobox_changed), self);       
-       } else if (GTK_IS_TOGGLE_BUTTON (widget)) {
-               g_signal_connect (G_OBJECT (widget), "toggled",
-                       G_CALLBACK (on_modified_checkbox_toggled), self);
-       }
-}
-
-static void
-on_field_entry_changed (GtkEditable *editable, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       g_assert(self);
-       enable_buttons(self);
-}
-
-static void
-on_field_combobox_changed (GtkComboBox *widget, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       g_assert(self);
-       enable_buttons(self);
-}
-
-/** This is a convenience function to create a field containing a mandatory widget.
- * When the widget is edited, the enable_buttons() vfunc will be called.
- */
-static GtkWidget* create_field(ModestAccountSettingsDialog *self,
-                              GtkSizeGroup *group,
-                              const gchar *value,
-                              GtkWidget *control,
-                              GtkWidget *icon,
-                              gboolean mandatory)
-{
-       GtkWidget *hbox;
-       gchar *title;
-       GtkWidget *label;
-
-       hbox = gtk_hbox_new (FALSE, 12);
-       if (mandatory)
-               title = g_strdup_printf("%s*:", value);
-       else
-               title = g_strdup_printf ("%s:", value);
-       label = gtk_label_new (title);
-       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-       g_free (title);
-
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX (hbox), control, TRUE, TRUE, 0);
-       gtk_size_group_add_widget (group, label);
-  
-       /* Connect to the appropriate changed signal for the widget, 
-        * so we can ask for the prev/next buttons to be enabled/disabled appropriately:
-        */
-       if (GTK_IS_ENTRY (control)) {
-               g_signal_connect (G_OBJECT (control), "changed",
-               G_CALLBACK (on_field_entry_changed), self);
-               
-       }
-       else if (GTK_IS_COMBO_BOX (control)) {
-               g_signal_connect (G_OBJECT (control), "changed",
-               G_CALLBACK (on_field_combobox_changed), self);
-       }
-       gtk_widget_show_all (hbox);
-        
-       return hbox;
-}
-
-static void
-on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
-{
-       gchar *tmp, *msg;
-                       
-       tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
-
-       modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
-
-       g_free (msg);
-       g_free (tmp);
-}
-
-static void
-on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
-{
-       gchar *tmp, *msg;
-                       
-       tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
-
-       modest_platform_information_banner(GTK_WIDGET (self), NULL, msg);
-
-       g_free (msg);
-       g_free (tmp);
-}
-
-
-static void
-on_entry_max (ModestValidatingEntry *self, gpointer user_data)
-{
-       modest_platform_information_banner(GTK_WIDGET (self), NULL, 
-                                        _CS("ckdg_ib_maximum_characters_reached"));
-}
-
-static GtkWidget*
-create_page_account_details (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkAdjustment *focus_adjustment = NULL;
-       GtkWidget *alignment;
-       
-       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-       /* The description widgets: */  
-       self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
-       GtkWidget *field = create_field (self, sizegroup, _("mcen_fi_account_title"), 
-               self->entry_account_title, NULL, TRUE);
-       gtk_widget_show (self->entry_account_title);
-       connect_for_modified (self, self->entry_account_title);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Prevent the use of some characters in the account title, 
-        * as required by our UI specification: */
-       GList *list_prevent = NULL;
-       list_prevent = g_list_append (list_prevent, "\\");
-       list_prevent = g_list_append (list_prevent, "/");
-       list_prevent = g_list_append (list_prevent, ":");
-       list_prevent = g_list_append (list_prevent, "*");
-       list_prevent = g_list_append (list_prevent, "?");
-       list_prevent = g_list_append (list_prevent, "\"");
-       list_prevent = g_list_append (list_prevent, "<"); 
-       list_prevent = g_list_append (list_prevent, ">"); 
-       list_prevent = g_list_append (list_prevent, "|");
-       list_prevent = g_list_append (list_prevent, "^");       
-       modest_validating_entry_set_unallowed_characters (
-               MODEST_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
-       g_list_free (list_prevent);
-       modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_account_title),
-                                        on_entry_invalid_account_title_character, self);
-       
-       /* Set max length as in the UI spec:
-        * The UI spec seems to want us to show a dialog if we hit the maximum. */
-       gtk_entry_set_max_length (GTK_ENTRY (self->entry_account_title), 64);
-       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_account_title), 
-               on_entry_max, self);
-       
-       /* The retrieve combobox: */
-       self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
-       field = create_field (self, sizegroup, _("mcen_fi_advsetup_retrievetype"), 
-                             self->combo_retrieve, NULL, TRUE);
-       gtk_widget_show (self->combo_retrieve);
-       connect_for_modified (self, self->combo_retrieve);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* The limit-retrieve combobox: */
-       self->combo_limit_retrieve = GTK_WIDGET (modest_limit_retrieve_combo_box_new ());
-       field = create_field (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"), 
-                             self->combo_limit_retrieve, NULL, TRUE);
-       gtk_widget_show (self->combo_limit_retrieve);
-       connect_for_modified (self, self->combo_limit_retrieve);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-
-       /* The leave-messages widgets: */
-       if(!self->checkbox_leave_messages)
-               self->checkbox_leave_messages = gtk_check_button_new ();
-       if (!self->caption_leave_messages) {
-               self->caption_leave_messages = create_field (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
-                                                            self->checkbox_leave_messages, NULL, TRUE);
-       }
-                       
-       gtk_widget_show (self->checkbox_leave_messages);
-       connect_for_modified (self, self->checkbox_leave_messages);
-       gtk_box_pack_start (GTK_BOX (box), self->caption_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (self->caption_leave_messages);
-       
-       gtk_widget_show (GTK_WIDGET (box));
-
-       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
-       gtk_container_add (GTK_CONTAINER (alignment), box);
-       gtk_widget_show (alignment);
-       
-       return GTK_WIDGET (alignment);
-}
-
-static gchar*
-get_entered_account_title (ModestAccountSettingsDialog *dialog)
-{
-       const gchar* account_title = 
-               gtk_entry_get_text (GTK_ENTRY (dialog->entry_account_title));
-       if (!account_title || (strlen (account_title) == 0))
-               return NULL;
-       else {
-               /* Strip it of whitespace at the start and end: */
-               gchar *result = g_strdup (account_title);
-               result = g_strstrip (result);
-               
-               if (!result)
-                       return NULL;
-                       
-               if (strlen (result) == 0) {
-                       g_free (result);
-                       return NULL;    
-               }
-               
-               return result;
-       }
-}
-
-
-static void
-on_button_signature (GtkButton *button, gpointer user_data)
-{
-/*     ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */
-       
-/*     /\* Create the window, if necessary: *\/ */
-/*     if (!(self->signature_dialog)) { */
-/*             self->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ()); */
-       
-/*             gboolean use_signature = modest_account_settings_get_use_signature (self->settings); */
-/*             const gchar *signature = modest_account_settings_get_signature(self->settings); */
-/*             gchar* account_title = get_entered_account_title (self); */
-/*             modest_signature_editor_dialog_set_settings ( */
-/*                     MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog),  */
-/*                     use_signature, signature, account_title); */
-
-/*             g_free (account_title); */
-/*             account_title = NULL; */
-/*             signature = NULL; */
-/*     } */
-
-/*     /\* Show the window: *\/         */
-/*     gtk_window_set_transient_for (GTK_WINDOW (self->signature_dialog), GTK_WINDOW (self)); */
-/*     gtk_window_set_modal (GTK_WINDOW (self->signature_dialog), TRUE); */
-/*     const gint response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog)); */
-/*     gtk_widget_hide (self->signature_dialog); */
-/*     if (response != GTK_RESPONSE_OK) { */
-/*             /\* Destroy the widget now, and its data: *\/ */
-/*             gtk_widget_destroy (self->signature_dialog); */
-/*             self->signature_dialog = NULL; */
-/*     } */
-/*     else { */
-/*             /\* Mark modified, so we use the dialog's data later: *\/ */
-/*             self->modified = TRUE;   */
-/*     } */
-}
-
-static GtkWidget*
-create_page_user_details (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkAdjustment *focus_adjustment = NULL;
-       GtkWidget *alignment;
-       
-       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
-       /* The name widgets: */
-       self->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
-
-       /* Set max length as in the UI spec:
-        * The UI spec seems to want us to show a dialog if we hit the maximum. */
-       gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64);
-       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_name), 
-               on_entry_max, self);
-       GtkWidget *field = create_field (self, sizegroup, 
-                                        _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, FALSE);
-       gtk_widget_show (self->entry_user_name);
-       connect_for_modified (self, self->entry_user_name);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-
-
-       /* Prevent the use of some characters in the name, 
-        * as required by our UI specification: */
-       GList *list_prevent = NULL;
-       list_prevent = g_list_append (list_prevent, "<");
-       list_prevent = g_list_append (list_prevent, ">");
-       modest_validating_entry_set_unallowed_characters (
-               MODEST_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
-       g_list_free (list_prevent);
-       modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_user_name),
-                                        on_entry_invalid_fullname_character, self);
-       
-       /* The username widgets: */     
-       self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
-       field = create_field (self, sizegroup, _("mail_fi_username"), 
-                               self->entry_user_username, NULL, TRUE);
-       gtk_widget_show (self->entry_user_username);
-       connect_for_modified (self, self->entry_user_username);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Prevent the use of some characters in the username, 
-        * as required by our UI specification: */
-       modest_validating_entry_set_unallowed_characters_whitespace (
-               MODEST_VALIDATING_ENTRY (self->entry_user_username));
-       
-       /* Set max length as in the UI spec:
-        * The UI spec seems to want us to show a dialog if we hit the maximum. */
-       gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_username), 64);
-       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_username), 
-               on_entry_max, self);
-       
-       /* The password widgets: */     
-       self->entry_user_password = gtk_entry_new ();
-       gtk_entry_set_visibility (GTK_ENTRY (self->entry_user_password), FALSE);
-       /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */
-       field = create_field (self, sizegroup, 
-                             _("mail_fi_password"), self->entry_user_password, NULL, FALSE);
-       gtk_widget_show (self->entry_user_password);
-       connect_for_modified (self, self->entry_user_password);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* The email address widgets: */        
-       self->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
-       field = create_field (self, sizegroup, 
-                             _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, TRUE);
-       gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */
-       gtk_widget_show (self->entry_user_email);
-       connect_for_modified (self, self->entry_user_email);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Set max length as in the UI spec:
-        * The UI spec seems to want us to show a dialog if we hit the maximum. */
-       gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_email), 64);
-       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_email), 
-               on_entry_max, self);
-       
-       /* Signature button: */
-       if (!self->button_signature)
-               self->button_signature = gtk_button_new_with_label (_("mcen_bd_edit"));
-       field = create_field (self, sizegroup, _("mcen_fi_email_signature"), 
-               self->button_signature, NULL, FALSE);
-       gtk_widget_show (self->button_signature);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-               
-       g_signal_connect (G_OBJECT (self->button_signature), "clicked",
-               G_CALLBACK (on_button_signature), self);
-               
-       gtk_widget_show (GTK_WIDGET (box));
-
-       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
-       gtk_container_add (GTK_CONTAINER (alignment), box);
-       gtk_widget_show (alignment);
-       
-       return GTK_WIDGET (alignment);
-}
-
-/** Change the field title for the incoming server, 
- * as specified in the UI spec:
- */
-static void update_incoming_server_title (ModestAccountSettingsDialog *self, ModestTransportStoreProtocol protocol)
-{
-       const gchar* type = 
-               (protocol == MODEST_PROTOCOL_STORE_POP ? 
-                       _("mail_fi_emailtype_pop3") : 
-                       _("mail_fi_emailtype_imap") );
-                       
-               
-       /* Note that this produces a compiler warning, 
-        * because the compiler does not know that the translated string will have a %s in it.
-        * I do not see a way to avoid the warning while still using these Logical IDs. murrayc. */
-       gchar* incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), type);
-       
-       /* This is a mandatory field, so add a *. This is usually done by 
-        * create_field() but we can't use that here. */
-       gchar *with_asterisk = g_strconcat (incomingserver_title, "*", NULL);
-       g_free (incomingserver_title);
-       
-       g_object_set (G_OBJECT (self->caption_incoming), "label", with_asterisk, NULL);
-       g_free(with_asterisk);
-}
-
-/** Change the field title for the incoming server, 
- * as specified in the UI spec:
- */
-static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self, ModestTransportStoreProtocol protocol)
-{
-       /* Fill the combo with appropriately titled choices for POP or IMAP. */
-       /* The choices are the same, but the titles are different, as in the UI spec. */
-       modest_serversecurity_combo_box_fill (
-               MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
-}
-           
-static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkWidget *alignment;
-       
-       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
-       /* The incoming server widgets: */
-       if(!self->entry_incomingserver)
-               self->entry_incomingserver = gtk_entry_new ();
-
-       if (self->caption_incoming)
-         gtk_widget_destroy (self->caption_incoming);
-          
-       /* The field title will be updated in update_incoming_server_title().
-        * so this default text will never be seen: */
-       /* (Note: Changing the title seems pointless. murrayc) */
-       self->caption_incoming = create_field (self, sizegroup, 
-                                            "Incoming Server", self->entry_incomingserver, NULL, TRUE);
-       gtk_widget_show (self->entry_incomingserver);
-       connect_for_modified (self, self->entry_incomingserver);
-       gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (self->caption_incoming);
-       
-       /* The secure connection widgets: */
-       /* This will be filled by update_incoming_server_security_choices(). */
-       if (!self->combo_incoming_security)
-               self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
-       GtkWidget *field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_connection"), 
-                                        self->combo_incoming_security, NULL, FALSE);
-       gtk_widget_show (self->combo_incoming_security);
-       connect_for_modified (self, self->combo_incoming_security);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Show a default port number when the security method changes, as per the UI spec: */
-       g_signal_connect (G_OBJECT (self->combo_incoming_security), "changed", (GCallback)on_combo_incoming_security_changed, self);
-       
-       
-       /* The port widgets: */
-       if (!self->entry_incoming_port)
-               self->entry_incoming_port = GTK_WIDGET (gtk_spin_button_new_with_range ((gdouble) PORT_MIN, (gdouble) PORT_MAX, 1.0));
-       field = create_field (self, sizegroup, _("mcen_fi_emailsetup_port"), 
-               self->entry_incoming_port, NULL, FALSE);
-       gtk_widget_show (self->entry_incoming_port);
-       connect_for_modified (self, self->entry_incoming_port);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* The secure authentication widgets: */
-       if(!self->checkbox_incoming_auth)
-               self->checkbox_incoming_auth = gtk_check_button_new ();
-       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
-                             self->checkbox_incoming_auth, NULL, FALSE);
-       gtk_widget_show (self->checkbox_incoming_auth);
-       connect_for_modified (self, self->checkbox_incoming_auth);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       gtk_widget_show (GTK_WIDGET (box));
-       
-       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
-       gtk_container_add (GTK_CONTAINER (alignment), box);
-       gtk_widget_show (alignment);
-       
-       return GTK_WIDGET (alignment);
-}
-
-static void
-on_toggle_button_changed (GtkToggleButton *togglebutton, gpointer user_data)
-{
-       GtkWidget *widget = GTK_WIDGET (user_data);
-       
-       /* Enable the widget only if the toggle button is active: */
-       const gboolean enable = gtk_toggle_button_get_active (togglebutton);
-       gtk_widget_set_sensitive (widget, enable);
-}
-
-/* Make the sensitivity of a widget depend on a toggle button.
- */
-static void
-enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button)
-{
-       g_signal_connect (G_OBJECT (button), "toggled",
-               G_CALLBACK (on_toggle_button_changed), widget);
-       
-       /* Set the starting sensitivity: */
-       on_toggle_button_changed (button, widget);
-}
-
-static void
-on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
-{
-/*     ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */
-       
-/*     /\* Create the window if necessary: *\/ */
-/*     if (!(self->specific_window)) { */
-/*             self->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); */
-/*             modest_connection_specific_smtp_window_fill_with_connections ( */
-/*                     MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager); */
-/*     } */
-
-/*     /\* Show the window: *\/         */
-/*     gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self)); */
-/*     gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE); */
-/*     gtk_widget_show (self->specific_window); */
-/*     self->modified = TRUE; */
-}
-
-static void
-on_combo_outgoing_auth_changed (GtkComboBox *widget, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       
-       ModestAuthProtocol protocol_security = 
-               modest_secureauth_combo_box_get_active_secureauth (
-                       MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
-       const gboolean secureauth_used = protocol_security != MODEST_PROTOCOL_AUTH_NONE;
-       
-       gtk_widget_set_sensitive (self->caption_outgoing_username, secureauth_used);
-       gtk_widget_set_sensitive (self->caption_outgoing_password, secureauth_used);
-}
-
-static void
-on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       
-       const gint port_number = 
-               modest_serversecurity_combo_box_get_active_serversecurity_port (
-                       MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
-
-       if(port_number != 0) {
-               gtk_spin_button_set_value (
-                       GTK_SPIN_BUTTON (self->entry_outgoing_port), (gdouble) port_number);
-       }               
-}
-
-static void
-on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       
-       const gint port_number = 
-               modest_serversecurity_combo_box_get_active_serversecurity_port (
-                       MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-
-       if(port_number != 0) {
-               gtk_spin_button_set_value (
-                       GTK_SPIN_BUTTON (self->entry_incoming_port), (gdouble) port_number);
-       }               
-}
-
-
-static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       GtkAdjustment *focus_adjustment = NULL;
-       GtkWidget *alignment;
-       
-       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
-       /* The outgoing server widgets: */
-       if (!self->entry_outgoingserver)
-               self->entry_outgoingserver = gtk_entry_new ();
-       GtkWidget *field = create_field (self, sizegroup, 
-                                        _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, FALSE);
-       gtk_widget_show (self->entry_outgoingserver);
-       connect_for_modified (self, self->entry_outgoingserver);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* The secure authentication widgets: */
-       if (!self->combo_outgoing_auth)
-               self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
-       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
-               self->combo_outgoing_auth, NULL, FALSE);
-       gtk_widget_show (self->combo_outgoing_auth);
-       connect_for_modified (self, self->combo_outgoing_auth);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */
-       g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self);
-       
-       /* The username widgets: */     
-       self->entry_outgoing_username = GTK_WIDGET (modest_validating_entry_new ());
-       self->caption_outgoing_username = create_field (self, sizegroup, _("mail_fi_username"), 
-                                                     self->entry_outgoing_username, NULL, TRUE);
-       gtk_widget_show (self->entry_outgoing_username);
-       connect_for_modified (self, self->entry_outgoing_username);
-       gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (self->caption_outgoing_username);
-       
-       /* Prevent the use of some characters in the username, 
-        * as required by our UI specification: */
-       modest_validating_entry_set_unallowed_characters_whitespace (
-               MODEST_VALIDATING_ENTRY (self->entry_outgoing_username));
-       
-       /* Set max length as in the UI spec:
-        * The UI spec seems to want us to show a dialog if we hit the maximum. */
-       gtk_entry_set_max_length (GTK_ENTRY (self->entry_outgoing_username), 64);
-       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_outgoing_username), 
-               on_entry_max, self);
-               
-       /* The password widgets: */     
-       self->entry_outgoing_password = gtk_entry_new ();
-       gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE);
-       /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */
-       self->caption_outgoing_password = create_field (self, sizegroup, 
-                                                     _("mail_fi_password"), self->entry_outgoing_password, NULL, FALSE);
-       gtk_widget_show (self->entry_outgoing_password);
-       connect_for_modified (self, self->entry_outgoing_password);
-       gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (self->caption_outgoing_password);
-       
-       /* The secure connection widgets: */
-       /* This will be filled and set with modest_serversecurity_combo_box_fill() 
-        * and modest_serversecurity_combo_box_set_active_serversecurity().
-        */
-       if (!self->combo_outgoing_security)
-               
-               self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
-       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_connection"), 
-                             self->combo_outgoing_security, NULL, FALSE);
-       gtk_widget_show (self->combo_outgoing_security);
-       connect_for_modified (self, self->combo_outgoing_security);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Show a default port number when the security method changes, as per the UI spec: */
-       g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed", (GCallback)on_combo_outgoing_security_changed, self);
-       
-       /* The port widgets: */
-       if (!self->entry_outgoing_port)
-               self->entry_outgoing_port = GTK_WIDGET (gtk_spin_button_new_with_range ((gdouble)PORT_MIN, (gdouble) PORT_MAX, 1.0));
-       field = create_field (self, sizegroup, _("mcen_fi_emailsetup_port"), 
-                             self->entry_outgoing_port, NULL, FALSE);
-       gtk_widget_show (self->entry_outgoing_port);
-       connect_for_modified (self, self->entry_outgoing_port);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       GtkWidget *separator = gtk_hseparator_new ();
-       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (separator);
-       
-       /* connection-specific checkbox: */
-       if (!self->checkbox_outgoing_smtp_specific) {
-               self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), 
-                       FALSE);
-       }
-       field = create_field (self, sizegroup, _("mcen_fi_advsetup_connection_smtp"), 
-                             self->checkbox_outgoing_smtp_specific, NULL, FALSE);
-       gtk_widget_show (self->checkbox_outgoing_smtp_specific);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       connect_for_modified (self, self->checkbox_outgoing_smtp_specific);
-       
-       /* Connection-specific SMTP-Severs Edit button: */
-       if (!self->button_outgoing_smtp_servers)
-               self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
-       field = create_field (self, sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
-                             self->button_outgoing_smtp_servers, NULL, FALSE);
-       gtk_widget_show (self->button_outgoing_smtp_servers);
-       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
-       gtk_widget_show (field);
-       
-       /* Only enable the button when the checkbox is checked: */
-       enable_widget_for_togglebutton (self->button_outgoing_smtp_servers, 
-               GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific));
-               
-       g_signal_connect (G_OBJECT (self->button_outgoing_smtp_servers), "clicked",
-               G_CALLBACK (on_button_outgoing_smtp_servers), self);
-               
-       gtk_widget_show (GTK_WIDGET (box));
-       
-       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
-       gtk_container_add (GTK_CONTAINER (alignment), box);
-       gtk_widget_show (alignment);
-       
-       return GTK_WIDGET (alignment);
-}
-       
-static gboolean
-check_data (ModestAccountSettingsDialog *self)
-{
-       /* Check that the title is not already in use: */
-       gchar* account_title = get_entered_account_title (self);
-       if (!account_title)
-               return FALSE; /* Should be prevented already anyway. */
-               
-       if (strcmp(account_title, self->original_account_title) != 0) {
-               /* Check the changed title: */
-               const gboolean name_in_use  = modest_account_mgr_account_with_display_name_exists (self->account_manager,
-                       account_title);
-       
-               if (name_in_use) {
-                       /* Warn the user via a dialog: */
-                       modest_platform_information_banner(NULL, NULL, _("mail_ib_account_name_already_existing"));
-               
-               g_free (account_title);
-                       return FALSE;
-               }
-       }
-       
-       g_free (account_title);
-       account_title  = NULL;
-
-       /* Check that the email address is valid: */
-       const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email));
-       if ((!email_address) || (strlen(email_address) == 0)) {
-               return FALSE;
-       }
-                       
-       if (!modest_text_utils_validate_email_address (email_address, NULL)) {
-               /* Warn the user via a dialog: */
-               modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_email"));
-                                         
-               /* Return focus to the email address entry: */
-               gtk_widget_grab_focus (self->entry_user_email);
-               gtk_editable_select_region (GTK_EDITABLE (self->entry_user_email), 0, -1);
-               return FALSE;
-       }
-
-       /* make sure the domain name for the incoming server is valid */
-       const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver));
-       if ((!hostname) || (strlen(hostname) == 0)) {
-               return FALSE;
-       }
-       
-       if (!modest_text_utils_validate_domain_name (hostname)) {
-               /* Warn the user via a dialog: */
-               modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_servername"));
-                                         
-               /* Return focus to the email address entry: */
-               gtk_widget_grab_focus (self->entry_incomingserver);
-               gtk_editable_select_region (GTK_EDITABLE (self->entry_incomingserver), 0, -1);
-               return FALSE;
-       }
-
-       /* make sure the domain name for the outgoing server is valid */
-       const gchar* hostname2 = gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver));
-       if ((!hostname2) || (strlen(hostname2) == 0)) {
-               return FALSE;
-       }
-       
-       if (!modest_text_utils_validate_domain_name (hostname2)) {
-               /* Warn the user via a dialog: */
-               modest_platform_information_banner (self->entry_outgoingserver, NULL, _("mcen_ib_invalid_servername"));
-
-               /* Return focus to the email address entry: */
-               gtk_widget_grab_focus (self->entry_outgoingserver);
-               gtk_editable_select_region (GTK_EDITABLE (self->entry_outgoingserver), 0, -1);
-               return FALSE;
-       }
-       
-       /* Find a suitable authentication method when secure authentication is desired */
-
-       const gint port_num = gtk_spin_button_get_value_as_int (
-                       GTK_SPIN_BUTTON (self->entry_incoming_port));
-       const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username));
-
-       /*
-       const ModestConnectionProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
-               MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-       */
-       /* If we use an encrypted protocol then there is no need to encrypt the password */
-       /* I don't think this is a good assumption. It overrides the user's request. murrayc: 
-        *  if (!modest_protocol_info_is_secure(protocol_security_incoming)) */
-       if (TRUE)
-       {
-               if (gtk_toggle_button_get_active (
-                               GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth))) {
-                       GError *error = NULL;
-
-                       GList *list_auth_methods = 
-                               modest_utils_get_supported_secure_authentication_methods (self->incoming_protocol, 
-                                       hostname, port_num, username, GTK_WINDOW (self), &error);
-                       if (list_auth_methods) {
-                               /* Use the first supported method.
-                                * TODO: Should we prioritize them, to prefer a particular one? */
-                               GList* method;
-                               for (method = list_auth_methods; method != NULL; method = g_list_next(method))
-                               {
-                                       ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(method->data));
-                                       // Allow secure methods, e.g MD5 only
-                                       if (modest_protocol_info_auth_is_secure(proto))
-                                       {
-                                               self->protocol_authentication_incoming = proto;
-                                               break;
-                                       }
-                               }
-                               g_list_free (list_auth_methods);
-                       }
-
-                       if (list_auth_methods == NULL || 
-                                       !modest_protocol_info_auth_is_secure(self->protocol_authentication_incoming))
-                       {
-                               if(error == NULL || error->domain != modest_utils_get_supported_secure_authentication_error_quark() ||
-                                               error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
-                                       modest_platform_information_banner(GTK_WIDGET (self), NULL, 
-                                                                        _("Could not discover supported secure authentication methods."));
-
-                               if(error != NULL)
-                                       g_error_free(error);
-                                       
-                               /* This is a nasty hack. jschmid. */
-                               /* Don't let the dialog close */
-                               /*g_signal_stop_emission_by_name (dialog, "response");*/
-                               return FALSE;
-                       }
-               }
-       }
-       
-       return TRUE;
-}
-/*
- */
-static void 
-on_response (GtkDialog *wizard_dialog,
-       gint response_id,
-       gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
-       enable_buttons (self);
-       
-       gboolean prevent_response = FALSE;
-
-       /* Warn about unsaved changes: */
-       if (response_id == GTK_RESPONSE_CANCEL && self->modified) {
-               GtkDialog *dialog = GTK_DIALOG (modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
-                                                                                        _("imum_nc_wizard_confirm_lose_changes")));
-               /* TODO: These button names will be ambiguous, and not specified in the UI specification. */
-               
-               const gint dialog_response = gtk_dialog_run (dialog);
-               gtk_widget_destroy (GTK_WIDGET (dialog));
-               
-               if (dialog_response != GTK_RESPONSE_OK)
-                       prevent_response = TRUE;
-       }
-       /* Check for invalid input: */
-       else if (response_id != GTK_RESPONSE_CANCEL && !check_data (self)) {
-               prevent_response = TRUE;
-       }
-               
-       if (prevent_response) {
-               /* This is a nasty hack. murrayc. */
-               /* Don't let the dialog close */
-               g_signal_stop_emission_by_name (wizard_dialog, "response");
-               return; 
-       }
-               
-       if (response_id == GTK_RESPONSE_OK) {
-               /* Try to save the changes if modified (NB #59251): */
-               if (self->modified)
-               {
-                       const gboolean saved = save_configuration (self);
-                       if (saved) {
-                               /* Do not show the account-saved dialog if we are just saving this 
-                                * temporarily, because from the user's point of view it will not 
-                                * really be saved (saved + enabled) until later
-                                */
-                               if (modest_account_settings_get_account_name (self->settings) != NULL) {
-                                       ModestServerAccountSettings *store_settings;
-                                       ModestServerAccountSettings *transport_settings;
-                                       const gchar *store_account_name;
-                                       const gchar *transport_account_name;
-
-
-                                       store_settings = modest_account_settings_get_store_settings (self->settings);
-                                       transport_settings = modest_account_settings_get_transport_settings (self->settings);
-                                       store_account_name = modest_server_account_settings_get_account_name (store_settings);
-                                       transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
-                                       
-                                       if (store_account_name) {
-                                               modest_account_mgr_notify_account_update (self->account_manager, 
-                                                                                         store_account_name);
-                                       }
-                                       if (transport_account_name) {
-                                               modest_account_mgr_notify_account_update (self->account_manager, 
-                                                                                         transport_account_name);
-                                       }
-                                       g_object_unref (store_settings);
-                                       g_object_unref (transport_settings);
-
-                                       modest_platform_information_banner(NULL, NULL, _("mcen_ib_advsetup_settings_saved"));
-                               }
-                       } else {
-                               modest_platform_information_banner (NULL, NULL, _("mail_ib_setting_failed"));
-                       }
-               }
-       }
-}
-
-static void
-modest_account_settings_dialog_init (ModestAccountSettingsDialog *self)
-{
-       /* Create the notebook to be used by the GtkDialog base class:
-        * Each page of the notebook will be a page of the wizard: */
-       self->notebook = GTK_NOTEBOOK (gtk_notebook_new());
-       self->settings = modest_account_settings_new ();
-
-       /* Get the account manager object, 
-        * so we can check for existing accounts,
-        * and create new accounts: */
-       self->account_manager = modest_runtime_get_account_mgr ();
-       g_assert (self->account_manager);
-       g_object_ref (self->account_manager);
-       
-       self->protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_PASSWORD;
-
-    /* Create the common pages, 
-     */
-       self->page_account_details = create_page_account_details (self);
-       self->page_user_details = create_page_user_details (self);
-       self->page_incoming = create_page_incoming (self);
-       self->page_outgoing = create_page_outgoing (self);
-       
-       /* Add the notebook pages: */
-       gtk_notebook_append_page (self->notebook, self->page_account_details, 
-               gtk_label_new (_("mcen_ti_account_settings_account")));
-       gtk_notebook_append_page (self->notebook, self->page_user_details, 
-               gtk_label_new (_("mcen_ti_account_settings_userinfo")));
-       gtk_notebook_append_page (self->notebook, self->page_incoming,
-               gtk_label_new (_("mcen_ti_advsetup_retrieval")));
-       gtk_notebook_append_page (self->notebook, self->page_outgoing,
-               gtk_label_new (_("mcen_ti_advsetup_sending")));
-               
-       GtkDialog *dialog = GTK_DIALOG (self);
-       gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (self->notebook));
-       gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF);
-       gtk_widget_show (GTK_WIDGET (self->notebook));
-        
-    /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
-    
-    /* Connect to the dialog's response signal: */
-    /* We use connect-before 
-     * so we can stop the signal emission, 
-     * to stop the default signal handler from closing the dialog.
-     */
-    g_signal_connect (G_OBJECT (self), "response",
-            G_CALLBACK (on_response), self); 
-            
-    self->modified = FALSE;
-
-    /* When this window is shown, hibernation should not be possible, 
-        * because there is no sensible way to save the state: */
-    modest_window_mgr_prevent_hibernation_while_window_is_shown (
-       modest_runtime_get_window_mgr (), GTK_WINDOW (self)); 
-
-    gtk_window_set_default_size (GTK_WINDOW (self), 600, 400);
-
-/*     hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings", */
-/*                                 modest_maemo_utils_get_osso_context()); */
-}
-
-ModestAccountSettingsDialog*
-modest_account_settings_dialog_new (void)
-{
-       return g_object_new (MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, NULL);
-}
-
-/** Update the UI with the stored account details, so they can be edited.
- * @account_name: Name of the account, which should contain incoming and outgoing server accounts.
- */
-void modest_account_settings_dialog_set_account (ModestAccountSettingsDialog *dialog, ModestAccountSettings *settings)
-{
-       ModestServerAccountSettings *incoming_account;
-       ModestServerAccountSettings *outgoing_account;
-       const gchar *account_name;
-
-       g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
-
-       incoming_account = modest_account_settings_get_store_settings (settings);
-       outgoing_account = modest_account_settings_get_transport_settings (settings);
-
-       account_name = modest_account_settings_get_account_name (settings);
-               
-       /* Save the account name so we can refer to it later: */
-       if (dialog->account_name)
-               g_free (dialog->account_name);
-       dialog->account_name = g_strdup (account_name);
-
-       if (dialog->settings)
-               g_object_unref (dialog->settings);
-       dialog->settings = g_object_ref (settings);
-       
-       /* Save the account title so we can refer to it if the user changes it: */
-       if (dialog->original_account_title)
-               g_free (dialog->original_account_title);
-       dialog->original_account_title = g_strdup (modest_account_settings_get_display_name (settings));
-       
-       /* Show the account data in the widgets: */
-       
-       /* Note that we never show the non-display name in the UI.
-        * (Though the display name defaults to the non-display name at the start.) */
-       gtk_entry_set_text( GTK_ENTRY (dialog->entry_account_title),
-                           null_means_empty (modest_account_settings_get_display_name (settings)));
-       gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_name), 
-                           null_means_empty (modest_account_settings_get_fullname (settings)));
-       gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_email), 
-                           null_means_empty (modest_account_settings_get_email_address (settings)));
-       modest_retrieve_combo_box_fill (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), 
-                                       modest_server_account_settings_get_protocol (incoming_account));
-       modest_retrieve_combo_box_set_active_retrieve_conf (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), 
-                                                           modest_account_settings_get_retrieve_type (settings));
-       modest_limit_retrieve_combo_box_set_active_limit_retrieve (
-               MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve), 
-               modest_account_settings_get_retrieve_limit (settings));
-       
-       
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages), 
-                                     modest_account_settings_get_leave_messages_on_server (settings));
-       
-       /* Only show the leave-on-server checkbox for POP, 
-        * as per the UI spec: */
-       if (modest_server_account_settings_get_protocol (incoming_account) != MODEST_PROTOCOL_STORE_POP) {
-               gtk_widget_hide (dialog->caption_leave_messages);
-       } else {
-               gtk_widget_show (dialog->caption_leave_messages);
-       }
-       
-       update_incoming_server_security_choices (dialog, modest_server_account_settings_get_protocol (incoming_account));
-       if (incoming_account) {
-               const gchar *username;
-               const gchar *password;
-               const gchar *hostname;
-               /* Remember this for later: */
-               dialog->incoming_protocol = modest_server_account_settings_get_protocol (incoming_account);;
-               
-               hostname = modest_server_account_settings_get_hostname (incoming_account);
-               username = modest_server_account_settings_get_username (incoming_account);
-               password = modest_server_account_settings_get_password (incoming_account);
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_username),
-                                   null_means_empty (username));
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_password), 
-                                   null_means_empty (password));
-                       
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver), 
-                                   null_means_empty (hostname));
-                       
-               /* The UI spec says:
-                * If secure authentication is unchecked, allow sending username and password also as plain text.
-        * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. 
-                * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported?
-         */                                                                                                             
-               modest_serversecurity_combo_box_set_active_serversecurity (
-                       MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), 
-                       modest_server_account_settings_get_security (incoming_account));
-               
-               /* Check if we have
-                - a secure protocol
-                OR
-                - use encrypted passwords
-               */
-               const ModestAuthProtocol secure_auth = modest_server_account_settings_get_auth_protocol (incoming_account);
-               dialog->protocol_authentication_incoming = (secure_auth != MODEST_PROTOCOL_AUTH_NONE)?
-                       secure_auth:MODEST_PROTOCOL_AUTH_PASSWORD;
-               if (modest_protocol_info_auth_is_secure(secure_auth))
-               {
-                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), 
-                                                    TRUE);
-               }
-               else
-               {
-                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), 
-                                                    FALSE);
-               };
-                                       
-               update_incoming_server_title (dialog, dialog->incoming_protocol);
-               
-               const gint port_num = modest_server_account_settings_get_port (incoming_account);
-               if (port_num == 0) {
-                       /* Show the appropriate port number: */
-                       on_combo_incoming_security_changed (
-                               GTK_COMBO_BOX (dialog->combo_incoming_security), dialog);
-               } else {
-                       /* Keep the user-entered port-number,
-                        * or the already-appropriate automatic port number: */
-                       gtk_spin_button_set_value (
-                               GTK_SPIN_BUTTON (dialog->entry_incoming_port), (gdouble) port_num);
-               }
-               g_object_unref (incoming_account);
-       }
-       
-       outgoing_account = modest_account_settings_get_transport_settings (settings);
-       if (outgoing_account) {
-               const gchar *hostname;
-               const gchar *username;
-               const gchar *password;
-
-               /* Remember this for later: */
-               dialog->outgoing_protocol = 
-                       modest_server_account_settings_get_protocol (outgoing_account);
-
-               hostname = modest_server_account_settings_get_hostname (outgoing_account);
-               username = modest_server_account_settings_get_username (outgoing_account);
-               password = modest_server_account_settings_get_password (outgoing_account);
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoingserver), 
-                                   null_means_empty (hostname));
-               
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_username), 
-                                   null_means_empty (username));
-               gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_password), 
-                                   null_means_empty (password));
-               
-               /* Get the secure-auth setting: */
-               const ModestAuthProtocol secure_auth = modest_server_account_settings_get_auth_protocol (outgoing_account);
-               modest_secureauth_combo_box_set_active_secureauth (
-                       MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth);
-               on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog);
-               
-               modest_serversecurity_combo_box_fill (
-                       MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), 
-                       dialog->outgoing_protocol);
-               
-               /* Get the security setting: */
-               const ModestConnectionProtocol security = modest_server_account_settings_get_security (outgoing_account);
-               modest_serversecurity_combo_box_set_active_serversecurity (
-                       MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security);
-               
-               const gint port_num = modest_server_account_settings_get_port (outgoing_account);
-               if (port_num == 0) {
-                       /* Show the appropriate port number: */
-                       on_combo_outgoing_security_changed (
-                               GTK_COMBO_BOX (dialog->combo_outgoing_security), dialog);
-               }
-               else {
-                       /* Keep the user-entered port-number,
-                        * or the already-appropriate automatic port number: */
-                       gtk_spin_button_set_value (
-                               GTK_SPIN_BUTTON (dialog->entry_outgoing_port), (gdouble) port_num);
-               }
-               
-               const gboolean has_specific = 
-                       modest_account_settings_get_use_connection_specific_smtp (settings);
-               gtk_toggle_button_set_active (
-                       GTK_TOGGLE_BUTTON (dialog->checkbox_outgoing_smtp_specific), 
-                       has_specific);
-               g_object_unref (outgoing_account);
-       }
-
-       /* Set window title according to account: */
-       /* TODO: Is this the correct way to find a human-readable name for
-        * the protocol used? */
-       const gchar* proto_str = modest_protocol_info_get_transport_store_protocol_name (dialog->incoming_protocol);
-       gchar *proto_name = g_utf8_strup(proto_str, -1);
-       const gchar *account_title = modest_account_settings_get_display_name(settings);
-
-       gchar *title = g_strdup_printf(_("mcen_ti_account_settings"), proto_name, account_title);
-       g_free (proto_name);
-
-       gtk_window_set_title (GTK_WINDOW (dialog), title);
-       g_free (title);
-
-       /* account_data->is_enabled,  */
-       /*account_data->is_default,  */
-
-       /* Unset the modified flag so we can detect changes later: */
-       dialog->modified = FALSE;
-}
-
-/** Show the User Info tab.
- */
-void modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog)
-{
-       const gint page_num = gtk_notebook_page_num (dialog->notebook, dialog->page_user_details);
-       if (page_num == -1) {
-               g_warning ("%s: notebook page not found.\n", __FUNCTION__);     
-       }
-               
-       /* Ensure that the widget is visible so that gtk_notebook_set_current_page() works: */
-       /* TODO: even this hack (recommened by the GTK+ documentation) doesn't seem to work. */
-       
-       gtk_widget_show (dialog->page_user_details);
-       gtk_widget_show (GTK_WIDGET (dialog->notebook));
-       gtk_widget_show (GTK_WIDGET (dialog));
-       gtk_notebook_set_current_page (dialog->notebook, page_num);
-}
-
-static gboolean
-save_configuration (ModestAccountSettingsDialog *dialog)
-{
-       const gchar* account_name = dialog->account_name;
-       ModestServerAccountSettings *store_settings;
-       ModestServerAccountSettings *transport_settings;
-               
-       /* Set the account data from the widgets: */
-       const gchar* user_fullname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name));
-       modest_account_settings_set_fullname (dialog->settings, user_fullname);
-       
-       const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_email));
-       modest_account_settings_set_email_address (dialog->settings, emailaddress);
-               
-/*     /\* Signature: *\/ */
-/*     if (dialog->signature_dialog) { */
-/*             gboolean use_signature = FALSE; */
-/*             gchar *signature =  */
-/*                     modest_signature_editor_dialog_get_settings (MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog), */
-/*                                                                  &use_signature); */
-       
-/*             modest_account_settings_set_use_signature (dialog->settings, use_signature); */
-/*             modest_account_settings_set_signature (dialog->settings, signature); */
-/*     } */
-       
-       ModestAccountRetrieveType retrieve_type = modest_retrieve_combo_box_get_active_retrieve_conf (
-               MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve));
-       modest_account_settings_set_retrieve_type (dialog->settings, retrieve_type);
-       
-       gint retrieve_limit = modest_limit_retrieve_combo_box_get_active_limit_retrieve (
-               MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve));
-       modest_account_settings_set_retrieve_limit (dialog->settings, retrieve_limit);
-       
-       const gboolean leave_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages));
-       modest_account_settings_set_leave_messages_on_server (dialog->settings, leave_on_server); 
-
-       store_settings = modest_account_settings_get_store_settings (dialog->settings);
-                       
-       const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incomingserver));
-       modest_server_account_settings_set_hostname (store_settings, hostname);
-                               
-       const gchar* username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_username));
-       modest_server_account_settings_set_username (store_settings, username);
-       
-       const gchar* password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_password));
-       modest_server_account_settings_set_password (store_settings, password);
-                       
-       /* port: */
-       gint port_num = gtk_spin_button_get_value_as_int (
-                       GTK_SPIN_BUTTON (dialog->entry_incoming_port));
-       modest_server_account_settings_set_port (store_settings, port_num);
-                       
-       /* The UI spec says:
-        * If secure authentication is unchecked, allow sending username and password also as plain text.
-        * If secure authentication is checked, require one of the secure 
-        * methods during connection: SSL, TLS, CRAM-MD5 etc. 
-        */
-       
-       const ModestConnectionProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
-               MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security));
-       modest_server_account_settings_set_security (store_settings, protocol_security_incoming);       
-       modest_server_account_settings_set_auth_protocol (store_settings, dialog->protocol_authentication_incoming);
-
-       g_object_unref (store_settings);
-       
-       /* Outgoing: */
-       transport_settings = modest_account_settings_get_transport_settings (dialog->settings);
-       
-       hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoingserver));
-       modest_server_account_settings_set_hostname (transport_settings, hostname);
-               
-       username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_username));
-       modest_server_account_settings_set_username (transport_settings, username);
-               
-       password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_password));
-       modest_server_account_settings_set_password (transport_settings, password);
-       
-       const ModestConnectionProtocol protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity (
-               MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security));
-       modest_server_account_settings_set_security (transport_settings, protocol_security_outgoing);
-       
-       const ModestAuthProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth (
-               MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth));
-       modest_server_account_settings_set_auth_protocol (transport_settings, protocol_authentication_outgoing);        
-       
-       /* port: */
-       port_num = gtk_spin_button_get_value_as_int (
-                       GTK_SPIN_BUTTON (dialog->entry_outgoing_port));
-       modest_server_account_settings_set_port (transport_settings, port_num);
-       g_object_unref (transport_settings);
-       
-       
-       /* Set the changed account title last, to simplify the previous code: */
-       gchar* account_title = get_entered_account_title (dialog);
-       if (!account_title)
-               return FALSE; /* Should be prevented already anyway. */
-               
-/*     if (strcmp (account_title, account_name) != 0) { */
-       modest_account_settings_set_display_name (dialog->settings, account_title);
-/*     } */
-       g_free (account_title);
-       account_title = NULL;
-       
-       /* Save connection-specific SMTP server accounts: */
-       modest_account_settings_set_use_connection_specific_smtp 
-               (dialog->settings, 
-                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific)));
-
-       /* this configuration is not persistent, we should not save */
-       if (account_name != NULL)
-               modest_account_mgr_save_account_settings (dialog->account_manager, dialog->settings);
-
-/*     if (dialog->specific_window) { */
-/*             return modest_connection_specific_smtp_window_save_server_accounts ( */
-/*                     MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window)); */
-/*     } else { */
-               return TRUE;
-/*     } */
-
-}
-
-static gboolean entry_is_empty (GtkWidget *entry)
-{
-       if (!entry)
-               return FALSE;
-               
-       const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry));
-       if ((!text) || (strlen(text) == 0))
-               return TRUE;
-       else {
-               /* Strip it of whitespace at the start and end: */
-               gchar *stripped = g_strdup (text);
-               stripped = g_strstrip (stripped);
-               
-               if (!stripped)
-                       return TRUE;
-                       
-               const gboolean result = (strlen (stripped) == 0);
-               
-               g_free (stripped);
-               return result;
-       }
-}
-
-static void
-enable_buttons (ModestAccountSettingsDialog *self)
-{
-       gboolean enable_ok = TRUE;
-       ModestAuthProtocol outgoing_auth_protocol;
-       
-       /* The account details title is mandatory: */
-       if (entry_is_empty(self->entry_account_title))
-               enable_ok = FALSE;
-
-       /* The user details username is mandatory: */
-       if (enable_ok && entry_is_empty(self->entry_user_username))
-               enable_ok = FALSE;
-               
-       /* The user details email address is mandatory: */
-       if (enable_ok && entry_is_empty (self->entry_user_email))
-               enable_ok = FALSE;
-
-       /* The custom incoming server is mandatory: */
-       if (enable_ok && entry_is_empty(self->entry_incomingserver))
-               enable_ok = FALSE;
-
-       /* The custom incoming server is mandatory: */
-       if (enable_ok && entry_is_empty(self->entry_outgoingserver))
-               enable_ok = FALSE;
-
-       /* Outgoing username is mandatory if outgoing auth is secure */
-       if (self->combo_outgoing_auth) {
-               outgoing_auth_protocol = modest_secureauth_combo_box_get_active_secureauth (
-                       MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
-               if (enable_ok && 
-                   outgoing_auth_protocol != MODEST_PROTOCOL_AUTH_NONE &&
-                   entry_is_empty (self->entry_outgoing_username))
-                       enable_ok = FALSE;
-       }
-                       
-       /* Enable the buttons, 
-        * identifying them via their associated response codes:
-        */
-       GtkDialog *dialog_base = GTK_DIALOG (self);
-       gtk_dialog_set_response_sensitive (dialog_base,
-                                          GTK_RESPONSE_OK,
-                                          enable_ok);
-}
-
-void
-modest_account_settings_dialog_check_allow_changes (ModestAccountSettingsDialog *self)
-{
-       ModestServerAccountSettings *incoming_settings;
-       const gchar *server_account_name;
-       gboolean username_known;
-
-       if (!G_IS_OBJECT (self->settings))
-               return;
-
-       incoming_settings = modest_account_settings_get_store_settings (self->settings);
-       server_account_name = modest_server_account_settings_get_account_name (incoming_settings);
-
-       username_known = modest_account_mgr_get_server_account_username_has_succeeded (self->account_manager, 
-                                                                                      server_account_name);
-
-       /* Enable or disable widgets */
-       gtk_widget_set_sensitive (self->entry_user_username, !username_known);
-       gtk_widget_set_sensitive (self->entry_incomingserver, !username_known);
-       gtk_widget_set_sensitive (self->entry_incoming_port, !username_known);
-       gtk_widget_set_sensitive (self->combo_incoming_security, !username_known);
-}
-
-void
-modest_account_settings_dialog_save_password (ModestAccountSettingsDialog *dialog)
-{
-       g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS_DIALOG (dialog));
-
-       dialog->modified = TRUE;
-}
-
-static void
-modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->get_property = modest_account_settings_dialog_get_property;
-       object_class->set_property = modest_account_settings_dialog_set_property;
-       object_class->dispose = modest_account_settings_dialog_dispose;
-       object_class->finalize = modest_account_settings_dialog_finalize;
-}
index fce5fb0..68b5f8d 100644 (file)
@@ -37,6 +37,7 @@
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
 #include "modest-account-assistant.h"
+#include "modest-account-protocol.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
 
@@ -173,7 +174,7 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
                gint response;
 
                if (modest_account_mgr_get_store_protocol (account_mgr, account_name) 
-                   == MODEST_PROTOCOL_STORE_POP) {
+                   == MODEST_PROTOCOLS_STORE_POP) {
                                txt = g_strdup_printf (_("emev_nc_delete_mailbox"), 
                                                       account_title);
                } else {
diff --git a/src/gnome/modest-default-account-settings-dialog.c b/src/gnome/modest-default-account-settings-dialog.c
new file mode 100644 (file)
index 0000000..2203f97
--- /dev/null
@@ -0,0 +1,1766 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#include "widgets/modest-account-settings-dialog.h"
+#include <glib/gi18n.h>
+#include <gtk/gtknotebook.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkcombobox.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkstock.h>
+
+#include "widgets/modest-serversecurity-combo-box.h"
+#include "widgets/modest-secureauth-combo-box.h"
+#include "widgets/modest-validating-entry.h"
+#include "widgets/modest-retrieve-combo-box.h"
+#include "widgets/modest-limit-retrieve-combo-box.h"
+#include "modest-defs.h"
+#include "modest-text-utils.h"
+#include "modest-account-mgr.h"
+#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
+#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
+#include "modest-protocol-registry.h"
+#include <modest-utils.h>
+#include <modest-platform.h>
+#include "widgets/modest-ui-constants.h"
+#include "widgets/modest-default-account-settings-dialog.h"
+#include <tny-account.h>
+#include <tny-status.h>
+
+#include <gconf/gconf-client.h>
+#include <string.h> /* For strlen(). */
+
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define PORT_MIN 1
+#define PORT_MAX 65535
+
+static void modest_account_settings_dialog_init (gpointer g, gpointer iface_data);
+
+G_DEFINE_TYPE_EXTENDED (ModestDefaultAccountSettingsDialog, 
+                        modest_default_account_settings_dialog, 
+                        GTK_TYPE_DIALOG,
+                        0, 
+                        G_IMPLEMENT_INTERFACE (MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, 
+                                               modest_account_settings_dialog_init));
+
+#define MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(o) \
+       (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+                                     MODEST_TYPE_DEFAULT_ACCOUNT_SETTINGS_DIALOG, \
+                                     ModestDefaultAccountSettingsDialogPrivate))
+
+typedef struct _ModestDefaultAccountSettingsDialogPrivate ModestDefaultAccountSettingsDialogPrivate;
+
+struct _ModestDefaultAccountSettingsDialogPrivate
+{
+       /* Used by derived widgets to query existing accounts,
+        * and to create new accounts: */
+       ModestAccountMgr *account_manager;
+       ModestAccountSettings *settings;
+       
+       gboolean modified;
+       gchar * account_name; /* This may not change. It is not user visible. */
+       ModestProtocolType incoming_protocol; /* This may not change. */
+       ModestProtocolType outgoing_protocol; /* This may not change. */
+       gchar * original_account_title;
+
+       ModestProtocolType protocol_authentication_incoming;
+       
+       GtkNotebook *notebook;
+       
+       GtkWidget *page_account_details;
+       GtkWidget *entry_account_title;
+       GtkWidget *combo_retrieve;
+       GtkWidget *combo_limit_retrieve;
+       GtkWidget *caption_leave_messages;
+       GtkWidget *checkbox_leave_messages;
+       
+       GtkWidget *page_user_details;
+       GtkWidget *entry_user_name;
+       GtkWidget *entry_user_username;
+       GtkWidget *entry_user_password;
+       GtkWidget *entry_user_email;
+       GtkWidget *entry_incoming_port;
+       GtkWidget *button_signature;
+       
+       GtkWidget *page_complete_easysetup;
+       
+       GtkWidget *page_incoming;
+       GtkWidget *caption_incoming;
+       GtkWidget *entry_incomingserver;
+       GtkWidget *combo_incoming_security;
+       GtkWidget *checkbox_incoming_auth;
+
+       GtkWidget *page_outgoing;
+       GtkWidget *entry_outgoingserver;
+       GtkWidget *caption_outgoing_username;
+       GtkWidget *entry_outgoing_username;
+       GtkWidget *caption_outgoing_password;
+       GtkWidget *entry_outgoing_password;
+       GtkWidget *combo_outgoing_security;
+       GtkWidget *combo_outgoing_auth;
+       GtkWidget *entry_outgoing_port;
+       GtkWidget *checkbox_outgoing_smtp_specific;
+       GtkWidget *button_outgoing_smtp_servers;
+       
+       GtkWidget *signature_dialog;
+};
+
+static void enable_buttons (ModestAccountSettingsDialog *self);
+static gboolean save_configuration (ModestAccountSettingsDialog *dialog);
+static void modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialog *dialog, 
+                                                                 ModestAccountSettings *settings);
+
+static const gchar *
+null_means_empty (const gchar * str)
+{
+       return str ? str : "";
+}
+
+
+static void
+modest_account_settings_dialog_get_property (GObject *object, guint property_id,
+                                                                                                                       GValue *value, GParamSpec *pspec)
+{
+       switch (property_id) {
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+       }
+}
+
+static void
+modest_account_settings_dialog_set_property (GObject *object, guint property_id,
+                                                                                                                       const GValue *value, GParamSpec *pspec)
+{
+       switch (property_id) {
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+       }
+}
+
+static void
+modest_account_settings_dialog_dispose (GObject *object)
+{
+       if (G_OBJECT_CLASS (modest_default_account_settings_dialog_parent_class)->dispose)
+               G_OBJECT_CLASS (modest_default_account_settings_dialog_parent_class)->dispose (object);
+}
+
+static void
+modest_account_settings_dialog_finalize (GObject *object)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (object);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       
+       if (priv->account_name)
+               g_free (priv->account_name);
+               
+       if (priv->original_account_title)
+               g_free (priv->original_account_title);
+               
+       if (priv->account_manager)
+               g_object_unref (G_OBJECT (priv->account_manager));
+               
+       if (priv->signature_dialog)
+               gtk_widget_destroy (priv->signature_dialog);
+
+       if (priv->settings) {
+               g_object_unref (priv->settings);
+               priv->settings = NULL;
+       }
+       
+       G_OBJECT_CLASS (modest_default_account_settings_dialog_parent_class)->finalize (object);
+}
+
+static void
+on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data);
+
+static void
+on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data);
+
+static void
+on_modified_combobox_changed (GtkComboBox *widget, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       priv->modified = TRUE;
+}
+
+static void
+on_modified_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       priv->modified = TRUE;
+}
+
+static void
+on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       priv->modified = TRUE;
+}
+
+static void
+on_modified_spin_button_changed (GtkSpinButton *spin_button, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       gint value = gtk_spin_button_get_value_as_int (spin_button);
+
+       gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, value > 0);
+       priv->modified = TRUE;
+}
+
+/* Set a modified boolean whenever the widget is changed, 
+ * so we can check for it later.
+ */
+static void
+connect_for_modified (ModestDefaultAccountSettingsDialog *self, 
+                     GtkWidget *widget)
+{
+       if (GTK_SPIN_BUTTON (widget)) {
+               g_signal_connect (G_OBJECT (widget), "value_changed",
+                       G_CALLBACK (on_modified_spin_button_changed), self);
+       }
+       else if (GTK_IS_ENTRY (widget)) {
+               g_signal_connect (G_OBJECT (widget), "changed",
+                       G_CALLBACK (on_modified_entry_changed), self);
+       } else if (GTK_IS_COMBO_BOX (widget)) {
+               g_signal_connect (G_OBJECT (widget), "changed",
+                       G_CALLBACK (on_modified_combobox_changed), self);       
+       } else if (GTK_IS_TOGGLE_BUTTON (widget)) {
+               g_signal_connect (G_OBJECT (widget), "toggled",
+                       G_CALLBACK (on_modified_checkbox_toggled), self);
+       }
+}
+
+static void
+on_field_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       g_assert(self);
+       enable_buttons(self);
+}
+
+static void
+on_field_combobox_changed (GtkComboBox *widget, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       g_assert(self);
+       enable_buttons(self);
+}
+
+/** This is a convenience function to create a field containing a mandatory widget.
+ * When the widget is edited, the enable_buttons() vfunc will be called.
+ */
+static GtkWidget* 
+create_field(ModestDefaultAccountSettingsDialog *self,
+            GtkSizeGroup *group,
+            const gchar *value,
+            GtkWidget *control,
+            GtkWidget *icon,
+            gboolean mandatory)
+{
+       GtkWidget *hbox;
+       gchar *title;
+       GtkWidget *label;
+
+       hbox = gtk_hbox_new (FALSE, 12);
+       if (mandatory)
+               title = g_strdup_printf("%s*:", value);
+       else
+               title = g_strdup_printf ("%s:", value);
+       label = gtk_label_new (title);
+       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+       g_free (title);
+
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (hbox), control, TRUE, TRUE, 0);
+       gtk_size_group_add_widget (group, label);
+  
+       /* Connect to the appropriate changed signal for the widget, 
+        * so we can ask for the prev/next buttons to be enabled/disabled appropriately:
+        */
+       if (GTK_IS_ENTRY (control)) {
+               g_signal_connect (G_OBJECT (control), "changed",
+               G_CALLBACK (on_field_entry_changed), self);
+               
+       }
+       else if (GTK_IS_COMBO_BOX (control)) {
+               g_signal_connect (G_OBJECT (control), "changed",
+               G_CALLBACK (on_field_combobox_changed), self);
+       }
+       gtk_widget_show_all (hbox);
+        
+       return hbox;
+}
+
+static void
+on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
+{
+       gchar *tmp, *msg;
+                       
+       tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
+       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+       modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
+
+       g_free (msg);
+       g_free (tmp);
+}
+
+static void
+on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data)
+{
+       gchar *tmp, *msg;
+                       
+       tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
+       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+
+       modest_platform_information_banner(GTK_WIDGET (self), NULL, msg);
+
+       g_free (msg);
+       g_free (tmp);
+}
+
+
+static void
+on_entry_max (ModestValidatingEntry *self, gpointer user_data)
+{
+       modest_platform_information_banner(GTK_WIDGET (self), NULL, 
+                                        _CS("ckdg_ib_maximum_characters_reached"));
+}
+
+static GtkWidget*
+create_page_account_details (ModestDefaultAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+       GtkWidget *alignment;   
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       /* The description widgets: */  
+       priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
+       GtkWidget *field = create_field (self, sizegroup, _("mcen_fi_account_title"), 
+               priv->entry_account_title, NULL, TRUE);
+       gtk_widget_show (priv->entry_account_title);
+       connect_for_modified (self, priv->entry_account_title);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Prevent the use of some characters in the account title, 
+        * as required by our UI specification: */
+       GList *list_prevent = NULL;
+       list_prevent = g_list_append (list_prevent, "\\");
+       list_prevent = g_list_append (list_prevent, "/");
+       list_prevent = g_list_append (list_prevent, ":");
+       list_prevent = g_list_append (list_prevent, "*");
+       list_prevent = g_list_append (list_prevent, "?");
+       list_prevent = g_list_append (list_prevent, "\"");
+       list_prevent = g_list_append (list_prevent, "<"); 
+       list_prevent = g_list_append (list_prevent, ">"); 
+       list_prevent = g_list_append (list_prevent, "|");
+       list_prevent = g_list_append (list_prevent, "^");       
+       modest_validating_entry_set_unallowed_characters (
+               MODEST_VALIDATING_ENTRY (priv->entry_account_title), list_prevent);
+       g_list_free (list_prevent);
+       modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_account_title),
+                                        on_entry_invalid_account_title_character, self);
+       
+       /* Set max length as in the UI spec:
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
+       gtk_entry_set_max_length (GTK_ENTRY (priv->entry_account_title), 64);
+       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_account_title), 
+               on_entry_max, self);
+       
+       /* The retrieve combobox: */
+       priv->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
+       field = create_field (self, sizegroup, _("mcen_fi_advsetup_retrievetype"), 
+                             priv->combo_retrieve, NULL, TRUE);
+       gtk_widget_show (priv->combo_retrieve);
+       connect_for_modified (self, priv->combo_retrieve);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* The limit-retrieve combobox: */
+       priv->combo_limit_retrieve = GTK_WIDGET (modest_limit_retrieve_combo_box_new ());
+       field = create_field (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"), 
+                             priv->combo_limit_retrieve, NULL, TRUE);
+       gtk_widget_show (priv->combo_limit_retrieve);
+       connect_for_modified (self, priv->combo_limit_retrieve);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+
+       /* The leave-messages widgets: */
+       if(!priv->checkbox_leave_messages)
+               priv->checkbox_leave_messages = gtk_check_button_new ();
+       if (!priv->caption_leave_messages) {
+               priv->caption_leave_messages = create_field (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
+                                                            priv->checkbox_leave_messages, NULL, TRUE);
+       }
+                       
+       gtk_widget_show (priv->checkbox_leave_messages);
+       connect_for_modified (self, priv->checkbox_leave_messages);
+       gtk_box_pack_start (GTK_BOX (box), priv->caption_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (priv->caption_leave_messages);
+       
+       gtk_widget_show (GTK_WIDGET (box));
+
+       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
+       gtk_container_add (GTK_CONTAINER (alignment), box);
+       gtk_widget_show (alignment);
+       
+       return GTK_WIDGET (alignment);
+}
+
+static gchar*
+get_entered_account_title (ModestAccountSettingsDialog *dialog)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
+
+       const gchar* account_title = 
+               gtk_entry_get_text (GTK_ENTRY (priv->entry_account_title));
+       if (!account_title || (strlen (account_title) == 0))
+               return NULL;
+       else {
+               /* Strip it of whitespace at the start and end: */
+               gchar *result = g_strdup (account_title);
+               result = g_strstrip (result);
+               
+               if (!result)
+                       return NULL;
+                       
+               if (strlen (result) == 0) {
+                       g_free (result);
+                       return NULL;    
+               }
+               
+               return result;
+       }
+}
+
+
+static void
+on_button_signature (GtkButton *button, gpointer user_data)
+{
+/*     ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */
+       
+/*     /\* Create the window, if necessary: *\/ */
+/*     if (!(priv->signature_dialog)) { */
+/*             priv->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ()); */
+       
+/*             gboolean use_signature = modest_account_settings_get_use_signature (priv->settings); */
+/*             const gchar *signature = modest_account_settings_get_signature(priv->settings); */
+/*             gchar* account_title = get_entered_account_title (self); */
+/*             modest_signature_editor_dialog_set_settings ( */
+/*                     MODEST_SIGNATURE_EDITOR_DIALOG (priv->signature_dialog),  */
+/*                     use_signature, signature, account_title); */
+
+/*             g_free (account_title); */
+/*             account_title = NULL; */
+/*             signature = NULL; */
+/*     } */
+
+/*     /\* Show the window: *\/         */
+/*     gtk_window_set_transient_for (GTK_WINDOW (priv->signature_dialog), GTK_WINDOW (self)); */
+/*     gtk_window_set_modal (GTK_WINDOW (priv->signature_dialog), TRUE); */
+/*     const gint response = gtk_dialog_run (GTK_DIALOG (priv->signature_dialog)); */
+/*     gtk_widget_hide (priv->signature_dialog); */
+/*     if (response != GTK_RESPONSE_OK) { */
+/*             /\* Destroy the widget now, and its data: *\/ */
+/*             gtk_widget_destroy (priv->signature_dialog); */
+/*             priv->signature_dialog = NULL; */
+/*     } */
+/*     else { */
+/*             /\* Mark modified, so we use the dialog's data later: *\/ */
+/*             priv->modified = TRUE;   */
+/*     } */
+}
+
+static GtkWidget*
+create_page_user_details (ModestDefaultAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+       GtkWidget *alignment;   
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+        
+       /* The name widgets: */
+       priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
+
+       /* Set max length as in the UI spec:
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
+       gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64);
+       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name), 
+               on_entry_max, self);
+       GtkWidget *field = create_field (self, sizegroup, 
+                                        _("mcen_li_emailsetup_name"), priv->entry_user_name, NULL, FALSE);
+       gtk_widget_show (priv->entry_user_name);
+       connect_for_modified (self, priv->entry_user_name);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+
+
+       /* Prevent the use of some characters in the name, 
+        * as required by our UI specification: */
+       GList *list_prevent = NULL;
+       list_prevent = g_list_append (list_prevent, "<");
+       list_prevent = g_list_append (list_prevent, ">");
+       modest_validating_entry_set_unallowed_characters (
+               MODEST_VALIDATING_ENTRY (priv->entry_user_name), list_prevent);
+       g_list_free (list_prevent);
+       modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_user_name),
+                                        on_entry_invalid_fullname_character, self);
+       
+       /* The username widgets: */     
+       priv->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
+       field = create_field (self, sizegroup, _("mail_fi_username"), 
+                               priv->entry_user_username, NULL, TRUE);
+       gtk_widget_show (priv->entry_user_username);
+       connect_for_modified (self, priv->entry_user_username);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Prevent the use of some characters in the username, 
+        * as required by our UI specification: */
+       modest_validating_entry_set_unallowed_characters_whitespace (
+               MODEST_VALIDATING_ENTRY (priv->entry_user_username));
+       
+       /* Set max length as in the UI spec:
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
+       gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_username), 64);
+       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_username), 
+               on_entry_max, self);
+       
+       /* The password widgets: */     
+       priv->entry_user_password = gtk_entry_new ();
+       gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
+       /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
+       field = create_field (self, sizegroup, 
+                             _("mail_fi_password"), priv->entry_user_password, NULL, FALSE);
+       gtk_widget_show (priv->entry_user_password);
+       connect_for_modified (self, priv->entry_user_password);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* The email address widgets: */        
+       priv->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
+       field = create_field (self, sizegroup, 
+                             _("mcen_li_emailsetup_email_address"), priv->entry_user_email, NULL, TRUE);
+       gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */
+       gtk_widget_show (priv->entry_user_email);
+       connect_for_modified (self, priv->entry_user_email);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Set max length as in the UI spec:
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
+       gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_email), 64);
+       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_email), 
+               on_entry_max, self);
+       
+       /* Signature button: */
+       if (!priv->button_signature)
+               priv->button_signature = gtk_button_new_with_label (_("mcen_bd_edit"));
+       field = create_field (self, sizegroup, _("mcen_fi_email_signature"), 
+               priv->button_signature, NULL, FALSE);
+       gtk_widget_show (priv->button_signature);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+               
+       g_signal_connect (G_OBJECT (priv->button_signature), "clicked",
+               G_CALLBACK (on_button_signature), self);
+               
+       gtk_widget_show (GTK_WIDGET (box));
+
+       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
+       gtk_container_add (GTK_CONTAINER (alignment), box);
+       gtk_widget_show (alignment);
+       
+       return GTK_WIDGET (alignment);
+}
+
+/** Change the field title for the incoming server, 
+ * as specified in the UI spec:
+ */
+static void 
+update_incoming_server_title (ModestAccountSettingsDialog *self, 
+                             ModestProtocolType protocol)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       const gchar* type = 
+               (protocol == MODEST_PROTOCOLS_STORE_POP ? 
+                       _("mail_fi_emailtype_pop3") : 
+                       _("mail_fi_emailtype_imap") );
+                       
+               
+       /* Note that this produces a compiler warning, 
+        * because the compiler does not know that the translated string will have a %s in it.
+        * I do not see a way to avoid the warning while still using these Logical IDs. murrayc. */
+       gchar* incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), type);
+       
+       /* This is a mandatory field, so add a *. This is usually done by 
+        * create_field() but we can't use that here. */
+       gchar *with_asterisk = g_strconcat (incomingserver_title, "*", NULL);
+       g_free (incomingserver_title);
+       
+       g_object_set (G_OBJECT (priv->caption_incoming), "label", with_asterisk, NULL);
+       g_free(with_asterisk);
+}
+
+/** Change the field title for the incoming server, 
+ * as specified in the UI spec:
+ */
+static void 
+update_incoming_server_security_choices (ModestAccountSettingsDialog *self, 
+                                        ModestProtocolType protocol)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       /* Fill the combo with appropriately titled choices for POP or IMAP. */
+       /* The choices are the same, but the titles are different, as in the UI spec. */
+       modest_serversecurity_combo_box_fill (
+               MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_incoming_security), protocol);
+}
+           
+static GtkWidget* 
+create_page_incoming (ModestDefaultAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+       GtkWidget *alignment;
+       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+        
+       /* The incoming server widgets: */
+       if(!priv->entry_incomingserver)
+               priv->entry_incomingserver = gtk_entry_new ();
+
+       if (priv->caption_incoming)
+         gtk_widget_destroy (priv->caption_incoming);
+          
+       /* The field title will be updated in update_incoming_server_title().
+        * so this default text will never be seen: */
+       /* (Note: Changing the title seems pointless. murrayc) */
+       priv->caption_incoming = create_field (self, sizegroup, 
+                                            "Incoming Server", priv->entry_incomingserver, NULL, TRUE);
+       gtk_widget_show (priv->entry_incomingserver);
+       connect_for_modified (self, priv->entry_incomingserver);
+       gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (priv->caption_incoming);
+       
+       /* The secure connection widgets: */
+       /* This will be filled by update_incoming_server_security_choices(). */
+       if (!priv->combo_incoming_security)
+               priv->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+       GtkWidget *field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_connection"), 
+                                        priv->combo_incoming_security, NULL, FALSE);
+       gtk_widget_show (priv->combo_incoming_security);
+       connect_for_modified (self, priv->combo_incoming_security);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Show a default port number when the security method changes, as per the UI spec: */
+       g_signal_connect (G_OBJECT (priv->combo_incoming_security), "changed", (GCallback)on_combo_incoming_security_changed, self);
+       
+       
+       /* The port widgets: */
+       if (!priv->entry_incoming_port)
+               priv->entry_incoming_port = GTK_WIDGET (gtk_spin_button_new_with_range ((gdouble) PORT_MIN, (gdouble) PORT_MAX, 1.0));
+       field = create_field (self, sizegroup, _("mcen_fi_emailsetup_port"), 
+               priv->entry_incoming_port, NULL, FALSE);
+       gtk_widget_show (priv->entry_incoming_port);
+       connect_for_modified (self, priv->entry_incoming_port);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* The secure authentication widgets: */
+       if(!priv->checkbox_incoming_auth)
+               priv->checkbox_incoming_auth = gtk_check_button_new ();
+       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
+                             priv->checkbox_incoming_auth, NULL, FALSE);
+       gtk_widget_show (priv->checkbox_incoming_auth);
+       connect_for_modified (self, priv->checkbox_incoming_auth);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       gtk_widget_show (GTK_WIDGET (box));
+       
+       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
+       gtk_container_add (GTK_CONTAINER (alignment), box);
+       gtk_widget_show (alignment);
+       
+       return GTK_WIDGET (alignment);
+}
+
+static void
+on_toggle_button_changed (GtkToggleButton *togglebutton, gpointer user_data)
+{
+       GtkWidget *widget = GTK_WIDGET (user_data);
+       
+       /* Enable the widget only if the toggle button is active: */
+       const gboolean enable = gtk_toggle_button_get_active (togglebutton);
+       gtk_widget_set_sensitive (widget, enable);
+}
+
+/* Make the sensitivity of a widget depend on a toggle button.
+ */
+static void
+enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button)
+{
+       g_signal_connect (G_OBJECT (button), "toggled",
+               G_CALLBACK (on_toggle_button_changed), widget);
+       
+       /* Set the starting sensitivity: */
+       on_toggle_button_changed (button, widget);
+}
+
+static void
+on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
+{
+/*     ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */
+       
+/*     /\* Create the window if necessary: *\/ */
+/*     if (!(priv->specific_window)) { */
+/*             priv->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); */
+/*             modest_connection_specific_smtp_window_fill_with_connections ( */
+/*                     MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (priv->specific_window), priv->account_manager); */
+/*     } */
+
+/*     /\* Show the window: *\/         */
+/*     gtk_window_set_transient_for (GTK_WINDOW (priv->specific_window), GTK_WINDOW (self)); */
+/*     gtk_window_set_modal (GTK_WINDOW (priv->specific_window), TRUE); */
+/*     gtk_widget_show (priv->specific_window); */
+/*     priv->modified = TRUE; */
+}
+
+static void
+on_combo_outgoing_auth_changed (GtkComboBox *widget, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       
+       ModestProtocolType protocol_security = 
+               modest_secureauth_combo_box_get_active_secureauth (
+                       MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
+       const gboolean secureauth_used = protocol_security != MODEST_PROTOCOLS_AUTH_NONE;
+       
+       gtk_widget_set_sensitive (priv->caption_outgoing_username, secureauth_used);
+       gtk_widget_set_sensitive (priv->caption_outgoing_password, secureauth_used);
+}
+
+static void
+on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       
+       const gint port_number = 
+               modest_serversecurity_combo_box_get_active_serversecurity_port (
+                       MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+
+       if(port_number != 0) {
+               gtk_spin_button_set_value (
+                       GTK_SPIN_BUTTON (priv->entry_outgoing_port), (gdouble) port_number);
+       }               
+}
+
+static void
+on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       const gint port_number = 
+               modest_serversecurity_combo_box_get_active_serversecurity_port (
+                       MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_incoming_security));
+
+       if(port_number != 0) {
+               gtk_spin_button_set_value (
+                       GTK_SPIN_BUTTON (priv->entry_incoming_port), (gdouble) port_number);
+       }               
+}
+
+
+static GtkWidget* 
+create_page_outgoing (ModestDefaultAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+       GtkWidget *alignment;
+       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+        
+       /* The outgoing server widgets: */
+       if (!priv->entry_outgoingserver)
+               priv->entry_outgoingserver = gtk_entry_new ();
+       GtkWidget *field = create_field (self, sizegroup, 
+                                        _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, FALSE);
+       gtk_widget_show (priv->entry_outgoingserver);
+       connect_for_modified (self, priv->entry_outgoingserver);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* The secure authentication widgets: */
+       if (!priv->combo_outgoing_auth)
+               priv->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
+       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
+               priv->combo_outgoing_auth, NULL, FALSE);
+       gtk_widget_show (priv->combo_outgoing_auth);
+       connect_for_modified (self, priv->combo_outgoing_auth);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */
+       g_signal_connect (G_OBJECT (priv->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self);
+       
+       /* The username widgets: */     
+       priv->entry_outgoing_username = GTK_WIDGET (modest_validating_entry_new ());
+       priv->caption_outgoing_username = create_field (self, sizegroup, _("mail_fi_username"), 
+                                                     priv->entry_outgoing_username, NULL, TRUE);
+       gtk_widget_show (priv->entry_outgoing_username);
+       connect_for_modified (self, priv->entry_outgoing_username);
+       gtk_box_pack_start (GTK_BOX (box), priv->caption_outgoing_username, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (priv->caption_outgoing_username);
+       
+       /* Prevent the use of some characters in the username, 
+        * as required by our UI specification: */
+       modest_validating_entry_set_unallowed_characters_whitespace (
+               MODEST_VALIDATING_ENTRY (priv->entry_outgoing_username));
+       
+       /* Set max length as in the UI spec:
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
+       gtk_entry_set_max_length (GTK_ENTRY (priv->entry_outgoing_username), 64);
+       modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_outgoing_username), 
+               on_entry_max, self);
+               
+       /* The password widgets: */     
+       priv->entry_outgoing_password = gtk_entry_new ();
+       gtk_entry_set_visibility (GTK_ENTRY (priv->entry_outgoing_password), FALSE);
+       /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_outgoing_password), '*'); */
+       priv->caption_outgoing_password = create_field (self, sizegroup, 
+                                                     _("mail_fi_password"), priv->entry_outgoing_password, NULL, FALSE);
+       gtk_widget_show (priv->entry_outgoing_password);
+       connect_for_modified (self, priv->entry_outgoing_password);
+       gtk_box_pack_start (GTK_BOX (box), priv->caption_outgoing_password, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (priv->caption_outgoing_password);
+       
+       /* The secure connection widgets: */
+       /* This will be filled and set with modest_serversecurity_combo_box_fill() 
+        * and modest_serversecurity_combo_box_set_active_serversecurity().
+        */
+       if (!priv->combo_outgoing_security)
+               
+               priv->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+       field = create_field (self, sizegroup, _("mcen_li_emailsetup_secure_connection"), 
+                             priv->combo_outgoing_security, NULL, FALSE);
+       gtk_widget_show (priv->combo_outgoing_security);
+       connect_for_modified (self, priv->combo_outgoing_security);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Show a default port number when the security method changes, as per the UI spec: */
+       g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_outgoing_security_changed, self);
+       
+       /* The port widgets: */
+       if (!priv->entry_outgoing_port)
+               priv->entry_outgoing_port = GTK_WIDGET (gtk_spin_button_new_with_range ((gdouble)PORT_MIN, (gdouble) PORT_MAX, 1.0));
+       field = create_field (self, sizegroup, _("mcen_fi_emailsetup_port"), 
+                             priv->entry_outgoing_port, NULL, FALSE);
+       gtk_widget_show (priv->entry_outgoing_port);
+       connect_for_modified (self, priv->entry_outgoing_port);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       GtkWidget *separator = gtk_hseparator_new ();
+       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (separator);
+       
+       /* connection-specific checkbox: */
+       if (!priv->checkbox_outgoing_smtp_specific) {
+               priv->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific), 
+                       FALSE);
+       }
+       field = create_field (self, sizegroup, _("mcen_fi_advsetup_connection_smtp"), 
+                             priv->checkbox_outgoing_smtp_specific, NULL, FALSE);
+       gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       connect_for_modified (self, priv->checkbox_outgoing_smtp_specific);
+       
+       /* Connection-specific SMTP-Severs Edit button: */
+       if (!priv->button_outgoing_smtp_servers)
+               priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
+       field = create_field (self, sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
+                             priv->button_outgoing_smtp_servers, NULL, FALSE);
+       gtk_widget_show (priv->button_outgoing_smtp_servers);
+       gtk_box_pack_start (GTK_BOX (box), field, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (field);
+       
+       /* Only enable the button when the checkbox is checked: */
+       enable_widget_for_togglebutton (priv->button_outgoing_smtp_servers, 
+               GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific));
+               
+       g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
+               G_CALLBACK (on_button_outgoing_smtp_servers), self);
+               
+       gtk_widget_show (GTK_WIDGET (box));
+       
+       alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 12, 12, 12, 12);
+       gtk_container_add (GTK_CONTAINER (alignment), box);
+       gtk_widget_show (alignment);
+       
+       return GTK_WIDGET (alignment);
+}
+       
+static gboolean
+check_data (ModestAccountSettingsDialog *self)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       /* Check that the title is not already in use: */
+       gchar* account_title = get_entered_account_title (self);
+       if (!account_title)
+               return FALSE; /* Should be prevented already anyway. */
+               
+       if (strcmp(account_title, priv->original_account_title) != 0) {
+               /* Check the changed title: */
+               const gboolean name_in_use  = modest_account_mgr_account_with_display_name_exists (priv->account_manager,
+                       account_title);
+       
+               if (name_in_use) {
+                       /* Warn the user via a dialog: */
+                       modest_platform_information_banner(NULL, NULL, _("mail_ib_account_name_already_existing"));
+               
+               g_free (account_title);
+                       return FALSE;
+               }
+       }
+       
+       g_free (account_title);
+       account_title  = NULL;
+
+       /* Check that the email address is valid: */
+       const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+       if ((!email_address) || (strlen(email_address) == 0)) {
+               return FALSE;
+       }
+                       
+       if (!modest_text_utils_validate_email_address (email_address, NULL)) {
+               /* Warn the user via a dialog: */
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_email"));
+                                         
+               /* Return focus to the email address entry: */
+               gtk_widget_grab_focus (priv->entry_user_email);
+               gtk_editable_select_region (GTK_EDITABLE (priv->entry_user_email), 0, -1);
+               return FALSE;
+       }
+
+       /* make sure the domain name for the incoming server is valid */
+       const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_incomingserver));
+       if ((!hostname) || (strlen(hostname) == 0)) {
+               return FALSE;
+       }
+       
+       if (!modest_text_utils_validate_domain_name (hostname)) {
+               /* Warn the user via a dialog: */
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_servername"));
+                                         
+               /* Return focus to the email address entry: */
+               gtk_widget_grab_focus (priv->entry_incomingserver);
+               gtk_editable_select_region (GTK_EDITABLE (priv->entry_incomingserver), 0, -1);
+               return FALSE;
+       }
+
+       /* make sure the domain name for the outgoing server is valid */
+       const gchar* hostname2 = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver));
+       if ((!hostname2) || (strlen(hostname2) == 0)) {
+               return FALSE;
+       }
+       
+       if (!modest_text_utils_validate_domain_name (hostname2)) {
+               /* Warn the user via a dialog: */
+               modest_platform_information_banner (priv->entry_outgoingserver, NULL, _("mcen_ib_invalid_servername"));
+
+               /* Return focus to the email address entry: */
+               gtk_widget_grab_focus (priv->entry_outgoingserver);
+               gtk_editable_select_region (GTK_EDITABLE (priv->entry_outgoingserver), 0, -1);
+               return FALSE;
+       }
+       
+       /* Find a suitable authentication method when secure authentication is desired */
+
+       const gint port_num = gtk_spin_button_get_value_as_int (
+                       GTK_SPIN_BUTTON (priv->entry_incoming_port));
+       const gchar* username = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username));
+
+       /*
+       const ModestProtocolType protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
+               MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_incoming_security));
+       */
+       /* If we use an encrypted protocol then there is no need to encrypt the password */
+       /* I don't think this is a good assumption. It overrides the user's request. murrayc: 
+        *  if (!modest_protocol_info_is_secure(protocol_security_incoming)) */
+       if (TRUE)
+       {
+               if (gtk_toggle_button_get_active (
+                               GTK_TOGGLE_BUTTON (priv->checkbox_incoming_auth))) {
+                       GError *error = NULL;
+
+                       GList *list_auth_methods = 
+                               modest_utils_get_supported_secure_authentication_methods (priv->incoming_protocol, 
+                                       hostname, port_num, username, GTK_WINDOW (self), &error);
+                       if (list_auth_methods) {
+                               /* Use the first supported method.
+                                * TODO: Should we prioritize them, to prefer a particular one? */
+                               GList* method;
+                               for (method = list_auth_methods; method != NULL; method = g_list_next(method))
+                               {
+                                       ModestProtocolType proto = (ModestProtocolType)(GPOINTER_TO_INT(method->data));
+                                       // Allow secure methods, e.g MD5 only
+                                       if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (), proto))
+                                       {
+                                               priv->protocol_authentication_incoming = proto;
+                                               break;
+                                       }
+                               }
+                               g_list_free (list_auth_methods);
+                       }
+
+                       if (list_auth_methods == NULL || 
+                           !modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (),
+                                                                              priv->protocol_authentication_incoming)) {
+                               if(error == NULL || error->domain != modest_utils_get_supported_secure_authentication_error_quark() ||
+                                               error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
+                                       modest_platform_information_banner(GTK_WIDGET (self), NULL, 
+                                                                        _("Could not discover supported secure authentication methods."));
+
+                               if(error != NULL)
+                                       g_error_free(error);
+                                       
+                               /* This is a nasty hack. jschmid. */
+                               /* Don't let the dialog close */
+                               /*g_signal_stop_emission_by_name (dialog, "response");*/
+                               return FALSE;
+                       }
+               }
+       }
+       
+       return TRUE;
+}
+/*
+ */
+static void 
+on_response (GtkDialog *wizard_dialog,
+       gint response_id,
+       gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       enable_buttons (self);
+       
+       gboolean prevent_response = FALSE;
+
+       /* Warn about unsaved changes: */
+       if (response_id == GTK_RESPONSE_CANCEL && priv->modified) {
+               GtkDialog *dialog = GTK_DIALOG (modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+                                                                                        _("imum_nc_wizard_confirm_lose_changes")));
+               /* TODO: These button names will be ambiguous, and not specified in the UI specification. */
+               
+               const gint dialog_response = gtk_dialog_run (dialog);
+               gtk_widget_destroy (GTK_WIDGET (dialog));
+               
+               if (dialog_response != GTK_RESPONSE_OK)
+                       prevent_response = TRUE;
+       }
+       /* Check for invalid input: */
+       else if (response_id != GTK_RESPONSE_CANCEL && !check_data (self)) {
+               prevent_response = TRUE;
+       }
+               
+       if (prevent_response) {
+               /* This is a nasty hack. murrayc. */
+               /* Don't let the dialog close */
+               g_signal_stop_emission_by_name (wizard_dialog, "response");
+               return; 
+       }
+               
+       if (response_id == GTK_RESPONSE_OK) {
+               /* Try to save the changes if modified (NB #59251): */
+               if (priv->modified)
+               {
+                       const gboolean saved = save_configuration (self);
+                       if (saved) {
+                               /* Do not show the account-saved dialog if we are just saving this 
+                                * temporarily, because from the user's point of view it will not 
+                                * really be saved (saved + enabled) until later
+                                */
+                               if (modest_account_settings_get_account_name (priv->settings) != NULL) {
+                                       ModestServerAccountSettings *store_settings;
+                                       ModestServerAccountSettings *transport_settings;
+                                       const gchar *store_account_name;
+                                       const gchar *transport_account_name;
+
+
+                                       store_settings = modest_account_settings_get_store_settings (priv->settings);
+                                       transport_settings = modest_account_settings_get_transport_settings (priv->settings);
+                                       store_account_name = modest_server_account_settings_get_account_name (store_settings);
+                                       transport_account_name = modest_server_account_settings_get_account_name (transport_settings);
+                                       
+                                       if (store_account_name) {
+                                               modest_account_mgr_notify_account_update (priv->account_manager, 
+                                                                                         store_account_name);
+                                       }
+                                       if (transport_account_name) {
+                                               modest_account_mgr_notify_account_update (priv->account_manager, 
+                                                                                         transport_account_name);
+                                       }
+                                       g_object_unref (store_settings);
+                                       g_object_unref (transport_settings);
+
+                                       modest_platform_information_banner(NULL, NULL, _("mcen_ib_advsetup_settings_saved"));
+                               }
+                       } else {
+                               modest_platform_information_banner (NULL, NULL, _("mail_ib_setting_failed"));
+                       }
+               }
+       }
+}
+
+static void 
+modest_account_settings_dialog_init (gpointer g, gpointer iface_data)
+{
+       ModestAccountSettingsDialogClass *iface = (ModestAccountSettingsDialogClass *) g;
+
+       iface->load_settings = modest_default_account_settings_dialog_load_settings;
+}
+
+static void
+modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog *self)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+
+       /* Create the notebook to be used by the GtkDialog base class:
+        * Each page of the notebook will be a page of the wizard: */
+       priv->notebook = GTK_NOTEBOOK (gtk_notebook_new());
+       priv->settings = modest_account_settings_new ();
+
+       /* Get the account manager object, 
+        * so we can check for existing accounts,
+        * and create new accounts: */
+       priv->account_manager = modest_runtime_get_account_mgr ();
+       g_assert (priv->account_manager);
+       g_object_ref (priv->account_manager);
+       
+       priv->protocol_authentication_incoming = MODEST_PROTOCOLS_AUTH_PASSWORD;
+
+    /* Create the common pages, 
+     */
+       priv->page_account_details = create_page_account_details (self);
+       priv->page_user_details = create_page_user_details (self);
+       priv->page_incoming = create_page_incoming (self);
+       priv->page_outgoing = create_page_outgoing (self);
+       
+       /* Add the notebook pages: */
+       gtk_notebook_append_page (priv->notebook, priv->page_account_details, 
+               gtk_label_new (_("mcen_ti_account_settings_account")));
+       gtk_notebook_append_page (priv->notebook, priv->page_user_details, 
+               gtk_label_new (_("mcen_ti_account_settings_userinfo")));
+       gtk_notebook_append_page (priv->notebook, priv->page_incoming,
+               gtk_label_new (_("mcen_ti_advsetup_retrieval")));
+       gtk_notebook_append_page (priv->notebook, priv->page_outgoing,
+               gtk_label_new (_("mcen_ti_advsetup_sending")));
+               
+       GtkDialog *dialog = GTK_DIALOG (self);
+       gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (priv->notebook));
+       gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF);
+       gtk_widget_show (GTK_WIDGET (priv->notebook));
+        
+    /* Add the buttons: */
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_OK);
+    
+    /* Connect to the dialog's response signal: */
+    /* We use connect-before 
+     * so we can stop the signal emission, 
+     * to stop the default signal handler from closing the dialog.
+     */
+    g_signal_connect (G_OBJECT (self), "response",
+            G_CALLBACK (on_response), self); 
+            
+    priv->modified = FALSE;
+
+    /* When this window is shown, hibernation should not be possible, 
+        * because there is no sensible way to save the state: */
+    modest_window_mgr_prevent_hibernation_while_window_is_shown (
+       modest_runtime_get_window_mgr (), GTK_WINDOW (self)); 
+
+    gtk_window_set_default_size (GTK_WINDOW (self), 600, 400);
+
+/*     hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings", */
+/*                                 modest_maemo_utils_get_osso_context()); */
+}
+
+ModestAccountSettingsDialog*
+modest_account_settings_dialog_new (void)
+{
+       return g_object_new (MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, NULL);
+}
+
+/** Update the UI with the stored account details, so they can be edited.
+ * @account_name: Name of the account, which should contain incoming and outgoing server accounts.
+ */
+static void 
+modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialog *dialog, 
+                                                     ModestAccountSettings *settings)
+{
+       ModestServerAccountSettings *incoming_account;
+       ModestServerAccountSettings *outgoing_account;
+       const gchar *account_name;
+
+       g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS (settings));
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
+
+       incoming_account = modest_account_settings_get_store_settings (settings);
+       outgoing_account = modest_account_settings_get_transport_settings (settings);
+
+       account_name = modest_account_settings_get_account_name (settings);
+               
+       /* Save the account name so we can refer to it later: */
+       if (priv->account_name)
+               g_free (priv->account_name);
+       priv->account_name = g_strdup (account_name);
+
+       if (priv->settings)
+               g_object_unref (priv->settings);
+       priv->settings = g_object_ref (settings);
+       
+       /* Save the account title so we can refer to it if the user changes it: */
+       if (priv->original_account_title)
+               g_free (priv->original_account_title);
+       priv->original_account_title = g_strdup (modest_account_settings_get_display_name (settings));
+       
+       /* Show the account data in the widgets: */
+       
+       /* Note that we never show the non-display name in the UI.
+        * (Though the display name defaults to the non-display name at the start.) */
+       gtk_entry_set_text( GTK_ENTRY (priv->entry_account_title),
+                           null_means_empty (modest_account_settings_get_display_name (settings)));
+       gtk_entry_set_text( GTK_ENTRY (priv->entry_user_name), 
+                           null_means_empty (modest_account_settings_get_fullname (settings)));
+       gtk_entry_set_text( GTK_ENTRY (priv->entry_user_email), 
+                           null_means_empty (modest_account_settings_get_email_address (settings)));
+       modest_retrieve_combo_box_fill (MODEST_RETRIEVE_COMBO_BOX (priv->combo_retrieve), 
+                                       modest_server_account_settings_get_protocol (incoming_account));
+       modest_retrieve_combo_box_set_active_retrieve_conf (MODEST_RETRIEVE_COMBO_BOX (priv->combo_retrieve), 
+                                                           modest_account_settings_get_retrieve_type (settings));
+       modest_limit_retrieve_combo_box_set_active_limit_retrieve (
+               MODEST_LIMIT_RETRIEVE_COMBO_BOX (priv->combo_limit_retrieve), 
+               modest_account_settings_get_retrieve_limit (settings));
+       
+       
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_leave_messages), 
+                                     modest_account_settings_get_leave_messages_on_server (settings));
+       
+       /* Only show the leave-on-server checkbox for POP, 
+        * as per the UI spec: */
+       if (modest_server_account_settings_get_protocol (incoming_account) != MODEST_PROTOCOLS_STORE_POP) {
+               gtk_widget_hide (priv->caption_leave_messages);
+       } else {
+               gtk_widget_show (priv->caption_leave_messages);
+       }
+       
+       update_incoming_server_security_choices (dialog, modest_server_account_settings_get_protocol (incoming_account));
+       if (incoming_account) {
+               const gchar *username;
+               const gchar *password;
+               const gchar *hostname;
+               /* Remember this for later: */
+               priv->incoming_protocol = modest_server_account_settings_get_protocol (incoming_account);;
+               
+               hostname = modest_server_account_settings_get_hostname (incoming_account);
+               username = modest_server_account_settings_get_username (incoming_account);
+               password = modest_server_account_settings_get_password (incoming_account);
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_user_username),
+                                   null_means_empty (username));
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_user_password), 
+                                   null_means_empty (password));
+                       
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_incomingserver), 
+                                   null_means_empty (hostname));
+                       
+               /* The UI spec says:
+                * If secure authentication is unchecked, allow sending username and password also as plain text.
+        * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. 
+                * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported?
+         */                                                                                                             
+               modest_serversecurity_combo_box_set_active_serversecurity (
+                       MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_incoming_security), 
+                       modest_server_account_settings_get_security_protocol (incoming_account));
+               
+               /* Check if we have
+                - a secure protocol
+                OR
+                - use encrypted passwords
+               */
+               const ModestProtocolType secure_auth = modest_server_account_settings_get_auth_protocol (incoming_account);
+               priv->protocol_authentication_incoming = (secure_auth != MODEST_PROTOCOLS_AUTH_NONE)?
+                       secure_auth:MODEST_PROTOCOLS_AUTH_PASSWORD;
+               if (modest_protocol_registry_protocol_type_is_secure(modest_runtime_get_protocol_registry (),
+                                                                    secure_auth))
+               {
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->checkbox_incoming_auth), 
+                                                    TRUE);
+               }
+               else
+               {
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->checkbox_incoming_auth), 
+                                                    FALSE);
+               };
+                                       
+               update_incoming_server_title (dialog, priv->incoming_protocol);
+               
+               const gint port_num = modest_server_account_settings_get_port (incoming_account);
+               if (port_num == 0) {
+                       /* Show the appropriate port number: */
+                       on_combo_incoming_security_changed (
+                               GTK_COMBO_BOX (priv->combo_incoming_security), dialog);
+               } else {
+                       /* Keep the user-entered port-number,
+                        * or the already-appropriate automatic port number: */
+                       gtk_spin_button_set_value (
+                               GTK_SPIN_BUTTON (priv->entry_incoming_port), (gdouble) port_num);
+               }
+               g_object_unref (incoming_account);
+       }
+       
+       outgoing_account = modest_account_settings_get_transport_settings (settings);
+       if (outgoing_account) {
+               const gchar *hostname;
+               const gchar *username;
+               const gchar *password;
+
+               /* Remember this for later: */
+               priv->outgoing_protocol = 
+                       modest_server_account_settings_get_protocol (outgoing_account);
+
+               hostname = modest_server_account_settings_get_hostname (outgoing_account);
+               username = modest_server_account_settings_get_username (outgoing_account);
+               password = modest_server_account_settings_get_password (outgoing_account);
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_outgoingserver), 
+                                   null_means_empty (hostname));
+               
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_outgoing_username), 
+                                   null_means_empty (username));
+               gtk_entry_set_text( GTK_ENTRY (priv->entry_outgoing_password), 
+                                   null_means_empty (password));
+               
+               /* Get the secure-auth setting: */
+               const ModestProtocolType secure_auth = modest_server_account_settings_get_auth_protocol (outgoing_account);
+               modest_secureauth_combo_box_set_active_secureauth (
+                       MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth), secure_auth);
+               on_combo_outgoing_auth_changed (GTK_COMBO_BOX (priv->combo_outgoing_auth), dialog);
+               
+               modest_serversecurity_combo_box_fill (
+                       MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), 
+                       priv->outgoing_protocol);
+               
+               /* Get the security setting: */
+               const ModestProtocolType security = 
+                       modest_server_account_settings_get_security_protocol (outgoing_account);
+               modest_serversecurity_combo_box_set_active_serversecurity (
+                       MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), security);
+               
+               const gint port_num = modest_server_account_settings_get_port (outgoing_account);
+               if (port_num == 0) {
+                       /* Show the appropriate port number: */
+                       on_combo_outgoing_security_changed (
+                               GTK_COMBO_BOX (priv->combo_outgoing_security), dialog);
+               }
+               else {
+                       /* Keep the user-entered port-number,
+                        * or the already-appropriate automatic port number: */
+                       gtk_spin_button_set_value (
+                               GTK_SPIN_BUTTON (priv->entry_outgoing_port), (gdouble) port_num);
+               }
+               
+               const gboolean has_specific = 
+                       modest_account_settings_get_use_connection_specific_smtp (settings);
+               gtk_toggle_button_set_active (
+                       GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific), 
+                       has_specific);
+               g_object_unref (outgoing_account);
+       }
+
+       /* Set window title according to account: */
+       /* TODO: Is this the correct way to find a human-readable name for
+        * the protocol used? */
+       ModestProtocol *proto = 
+               modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), 
+                                                              priv->incoming_protocol);
+
+       const gchar* proto_str = modest_protocol_get_display_name (proto);
+       gchar *proto_name = g_utf8_strup(proto_str, -1);
+       const gchar *account_title = modest_account_settings_get_display_name(settings);
+
+       gchar *title = g_strdup_printf(_("mcen_ti_account_settings"), proto_name, account_title);
+       g_free (proto_name);
+
+       gtk_window_set_title (GTK_WINDOW (dialog), title);
+       g_free (title);
+
+       /* account_data->is_enabled,  */
+       /*account_data->is_default,  */
+
+       /* Unset the modified flag so we can detect changes later: */
+       priv->modified = FALSE;
+}
+
+/** Show the User Info tab.
+ */
+void 
+modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
+
+       const gint page_num = gtk_notebook_page_num (priv->notebook, priv->page_user_details);
+       if (page_num == -1) {
+               g_warning ("%s: notebook page not found.\n", __FUNCTION__);     
+       }
+               
+       /* Ensure that the widget is visible so that gtk_notebook_set_current_page() works: */
+       /* TODO: even this hack (recommened by the GTK+ documentation) doesn't seem to work. */
+       
+       gtk_widget_show (priv->page_user_details);
+       gtk_widget_show (GTK_WIDGET (priv->notebook));
+       gtk_widget_show (GTK_WIDGET (dialog));
+       gtk_notebook_set_current_page (priv->notebook, page_num);
+}
+
+static gboolean
+save_configuration (ModestAccountSettingsDialog *dialog)
+{
+       ModestServerAccountSettings *store_settings;
+       ModestServerAccountSettings *transport_settings;
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
+               
+       /* Set the account data from the widgets: */
+       const gchar* account_name = priv->account_name;
+       const gchar* user_fullname = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_name));
+       modest_account_settings_set_fullname (priv->settings, user_fullname);
+       
+       const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+       modest_account_settings_set_email_address (priv->settings, emailaddress);
+               
+/*     /\* Signature: *\/ */
+/*     if (priv->signature_dialog) { */
+/*             gboolean use_signature = FALSE; */
+/*             gchar *signature =  */
+/*                     modest_signature_editor_dialog_get_settings (MODEST_SIGNATURE_EDITOR_DIALOG (priv->signature_dialog), */
+/*                                                                  &use_signature); */
+       
+/*             modest_account_settings_set_use_signature (priv->settings, use_signature); */
+/*             modest_account_settings_set_signature (priv->settings, signature); */
+/*     } */
+       
+       ModestAccountRetrieveType retrieve_type = modest_retrieve_combo_box_get_active_retrieve_conf (
+               MODEST_RETRIEVE_COMBO_BOX (priv->combo_retrieve));
+       modest_account_settings_set_retrieve_type (priv->settings, retrieve_type);
+       
+       gint retrieve_limit = modest_limit_retrieve_combo_box_get_active_limit_retrieve (
+               MODEST_LIMIT_RETRIEVE_COMBO_BOX (priv->combo_limit_retrieve));
+       modest_account_settings_set_retrieve_limit (priv->settings, retrieve_limit);
+       
+       const gboolean leave_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->checkbox_leave_messages));
+       modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server); 
+
+       store_settings = modest_account_settings_get_store_settings (priv->settings);
+                       
+       const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_incomingserver));
+       modest_server_account_settings_set_hostname (store_settings, hostname);
+                               
+       const gchar* username = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username));
+       modest_server_account_settings_set_username (store_settings, username);
+       
+       const gchar* password = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password));
+       modest_server_account_settings_set_password (store_settings, password);
+                       
+       /* port: */
+       gint port_num = gtk_spin_button_get_value_as_int (
+                       GTK_SPIN_BUTTON (priv->entry_incoming_port));
+       modest_server_account_settings_set_port (store_settings, port_num);
+                       
+       /* The UI spec says:
+        * If secure authentication is unchecked, allow sending username and password also as plain text.
+        * If secure authentication is checked, require one of the secure 
+        * methods during connection: SSL, TLS, CRAM-MD5 etc. 
+        */
+       
+       const ModestProtocolType protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
+               MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_incoming_security));
+       modest_server_account_settings_set_security_protocol (store_settings, 
+                                                             protocol_security_incoming);      
+       modest_server_account_settings_set_auth_protocol (store_settings, 
+                                                         priv->protocol_authentication_incoming);
+
+       g_object_unref (store_settings);
+       
+       /* Outgoing: */
+       transport_settings = modest_account_settings_get_transport_settings (priv->settings);
+       
+       hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver));
+       modest_server_account_settings_set_hostname (transport_settings, hostname);
+               
+       username = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoing_username));
+       modest_server_account_settings_set_username (transport_settings, username);
+               
+       password = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoing_password));
+       modest_server_account_settings_set_password (transport_settings, password);
+       
+       const ModestProtocolType protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity (
+               MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+       modest_server_account_settings_set_security_protocol (transport_settings, 
+                                                             protocol_security_outgoing);
+       
+       const ModestProtocolType protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth (
+               MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
+       modest_server_account_settings_set_auth_protocol (transport_settings, protocol_authentication_outgoing);        
+       
+       /* port: */
+       port_num = gtk_spin_button_get_value_as_int (
+                       GTK_SPIN_BUTTON (priv->entry_outgoing_port));
+       modest_server_account_settings_set_port (transport_settings, port_num);
+       g_object_unref (transport_settings);
+       
+       
+       /* Set the changed account title last, to simplify the previous code: */
+       gchar* account_title = get_entered_account_title (dialog);
+       if (!account_title)
+               return FALSE; /* Should be prevented already anyway. */
+               
+/*     if (strcmp (account_title, account_name) != 0) { */
+       modest_account_settings_set_display_name (priv->settings, account_title);
+/*     } */
+       g_free (account_title);
+       account_title = NULL;
+       
+       /* Save connection-specific SMTP server accounts: */
+       modest_account_settings_set_use_connection_specific_smtp 
+               (priv->settings, 
+                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+
+       /* this configuration is not persistent, we should not save */
+       if (account_name != NULL)
+               modest_account_mgr_save_account_settings (priv->account_manager, priv->settings);
+
+/*     if (priv->specific_window) { */
+/*             return modest_connection_specific_smtp_window_save_server_accounts ( */
+/*                     MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (priv->specific_window)); */
+/*     } else { */
+               return TRUE;
+/*     } */
+
+}
+
+static gboolean entry_is_empty (GtkWidget *entry)
+{
+       if (!entry)
+               return FALSE;
+               
+       const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry));
+       if ((!text) || (strlen(text) == 0))
+               return TRUE;
+       else {
+               /* Strip it of whitespace at the start and end: */
+               gchar *stripped = g_strdup (text);
+               stripped = g_strstrip (stripped);
+               
+               if (!stripped)
+                       return TRUE;
+                       
+               const gboolean result = (strlen (stripped) == 0);
+               
+               g_free (stripped);
+               return result;
+       }
+}
+
+static void
+enable_buttons (ModestAccountSettingsDialog *self)
+{
+       gboolean enable_ok = TRUE;
+       ModestProtocolType outgoing_auth_protocol;
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);;
+       
+       /* The account details title is mandatory: */
+       if (entry_is_empty(priv->entry_account_title))
+               enable_ok = FALSE;
+
+       /* The user details username is mandatory: */
+       if (enable_ok && entry_is_empty(priv->entry_user_username))
+               enable_ok = FALSE;
+               
+       /* The user details email address is mandatory: */
+       if (enable_ok && entry_is_empty (priv->entry_user_email))
+               enable_ok = FALSE;
+
+       /* The custom incoming server is mandatory: */
+       if (enable_ok && entry_is_empty(priv->entry_incomingserver))
+               enable_ok = FALSE;
+
+       /* The custom incoming server is mandatory: */
+       if (enable_ok && entry_is_empty(priv->entry_outgoingserver))
+               enable_ok = FALSE;
+
+       /* Outgoing username is mandatory if outgoing auth is secure */
+       if (priv->combo_outgoing_auth) {
+               outgoing_auth_protocol = modest_secureauth_combo_box_get_active_secureauth (
+                       MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
+               if (enable_ok && 
+                   outgoing_auth_protocol != MODEST_PROTOCOLS_AUTH_NONE &&
+                   entry_is_empty (priv->entry_outgoing_username))
+                       enable_ok = FALSE;
+       }
+                       
+       /* Enable the buttons, 
+        * identifying them via their associated response codes:
+        */
+       GtkDialog *dialog_base = GTK_DIALOG (self);
+       gtk_dialog_set_response_sensitive (dialog_base,
+                                          GTK_RESPONSE_OK,
+                                          enable_ok);
+}
+
+void
+modest_account_settings_dialog_check_allow_changes (ModestAccountSettingsDialog *self)
+{
+       ModestServerAccountSettings *incoming_settings;
+       const gchar *server_account_name;
+       gboolean username_known;
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);;
+
+       if (!G_IS_OBJECT (priv->settings))
+               return;
+
+       incoming_settings = modest_account_settings_get_store_settings (priv->settings);
+       server_account_name = modest_server_account_settings_get_account_name (incoming_settings);
+
+       username_known = modest_account_mgr_get_server_account_username_has_succeeded (priv->account_manager, 
+                                                                                      server_account_name);
+
+       /* Enable or disable widgets */
+       gtk_widget_set_sensitive (priv->entry_user_username, !username_known);
+       gtk_widget_set_sensitive (priv->entry_incomingserver, !username_known);
+       gtk_widget_set_sensitive (priv->entry_incoming_port, !username_known);
+       gtk_widget_set_sensitive (priv->combo_incoming_security, !username_known);
+}
+
+void
+modest_account_settings_dialog_save_password (ModestAccountSettingsDialog *dialog)
+{
+       ModestDefaultAccountSettingsDialogPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS_DIALOG (dialog));
+
+       priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
+       priv->modified = TRUE;
+}
+
+static void
+modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       g_type_class_add_private (klass, sizeof (ModestDefaultAccountSettingsDialogPrivate));
+
+       object_class->get_property = modest_account_settings_dialog_get_property;
+       object_class->set_property = modest_account_settings_dialog_set_property;
+       object_class->dispose = modest_account_settings_dialog_dispose;
+       object_class->finalize = modest_account_settings_dialog_finalize;
+}
index d6e2a31..600999d 100644 (file)
@@ -42,6 +42,8 @@
 #include <gtk/gtkspinbutton.h>
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "widgets/modest-combo-box.h"
+#include "modest-runtime.h"
+#include "modest-defs.h"
 #include "gnome/modest-gnome-global-settings-dialog.h"
 #include "widgets/modest-ui-constants.h"
 
@@ -60,6 +62,7 @@ enum {
        LAST_SIGNAL
 };
 
+static void modest_gnome_global_settings_dialog_load_settings (ModestGlobalSettingsDialog *self);
 static GtkWidget* create_updating_page  (ModestGnomeGlobalSettingsDialog *self);
 static GtkWidget* create_composing_page (ModestGnomeGlobalSettingsDialog *self);
 static ModestConnectedVia current_connection (void);
index d7cc553..cf2bed4 100644 (file)
@@ -45,7 +45,7 @@
 #include "modest-main-window-ui.h"
 #include "modest-main-window-ui-dimming.h"
 #include "modest-account-mgr.h"
-#include "modest-conf.h"
+#include "modest-defs.h"
 #include <modest-tny-msg.h>
 #include "modest-mail-operation.h"
 #include "modest-icon-names.h"
index 684dbee..b02ad9f 100644 (file)
@@ -1125,8 +1125,8 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
 }
 
 void            
-modest_msg_edit_window_set_draft           (ModestMsgEditWindow *window,
-                                           TnyMsg *draft)
+modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
+                                 TnyMsg *draft)
 {
        ModestMsgEditWindowPrivate *priv;
        TnyHeader *header = NULL;
@@ -1150,7 +1150,7 @@ modest_msg_edit_window_set_draft           (ModestMsgEditWindow *window,
                }
                priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
                if (GTK_WIDGET_REALIZED (window))
-                       modest_window_mgr_register_window (mgr, MODEST_WINDOW (window));
+                       modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL);
        }
 
        priv->draft_msg = draft;
index 35fe46e..c6ecc38 100644 (file)
@@ -37,7 +37,7 @@
 #include <modest-runtime.h>
 #include <modest-main-window-ui.h>
 #include "modest-msg-view-window-ui-dimming.h"
-
+#include "modest-defs.h"
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-window-priv.h>
 #include "widgets/modest-msg-view.h"
index 39297de..d986295 100644 (file)
@@ -36,9 +36,8 @@
 #include "modest-platform.h"
 #include "modest-mail-operation-queue.h"
 #include "modest-runtime.h"
-
 #include "gnome/modest-gnome-global-settings-dialog.h"
-#include "widgets/modest-account-settings-dialog.h"
+#include "widgets/modest-default-account-settings-dialog.h"
 #include "gnome/modest-account-assistant.h"
 #include "gnome/modest-gnome-sort-dialog.h"
 #include "widgets/modest-details-dialog.h"
@@ -496,9 +495,9 @@ modest_platform_show_addressbook (GtkWindow *parent_window)
 GtkWidget *
 modest_platform_get_account_settings_dialog (ModestAccountSettings *settings)
 {
-       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
+       ModestAccountSettingsDialog *dialog = modest_default_account_settings_dialog_new ();
 
-       modest_account_settings_dialog_set_account (dialog, settings);
+       modest_account_settings_dialog_load_settings (dialog, settings);
        return GTK_WIDGET (dialog);
 }
 
@@ -578,7 +577,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window,
 
        /* Create pannable and add it to the dialog */
        folder_view_container = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy  (GTK_SCROLLED_WINDOW (*folder_view_container),
+       gtk_scrolled_window_set_policy  (GTK_SCROLLED_WINDOW (folder_view_container),
                                         GTK_POLICY_AUTOMATIC,
                                         GTK_POLICY_AUTOMATIC);
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container);
index e1b738b..7a0a0d1 100644 (file)
@@ -31,6 +31,7 @@
 #include <gtk/gtk.h>
 #include <widgets/modest-combo-box.h>
 #include "modest-store-widget.h"
+#include "modest-runtime.h"
 #include <string.h>
 
 /* 'private'/'protected' functions */
@@ -57,7 +58,7 @@ struct _ModestStoreWidgetPrivate {
        
        GtkWidget *chooser;
 
-       ModestTransportStoreProtocol proto;
+       ModestProtocolType proto;
 };
 #define MODEST_STORE_WIDGET_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                  MODEST_TYPE_STORE_WIDGET, \
@@ -120,7 +121,7 @@ modest_store_widget_init (ModestStoreWidget *obj)
        ModestStoreWidgetPrivate *priv;
        
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(obj); 
-       priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+       priv->proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
 }
 
 
@@ -283,7 +284,7 @@ modest_store_widget_finalize (GObject *obj)
 
 
 GtkWidget*
-modest_store_widget_new (ModestTransportStoreProtocol proto)
+modest_store_widget_new (ModestProtocolType proto)
 {
        GObject *obj;
        GtkWidget *w;
@@ -298,11 +299,11 @@ modest_store_widget_new (ModestTransportStoreProtocol proto)
 
        priv->proto = proto;
        
-       if (proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP)
+       if (proto == MODEST_PROTOCOLS_STORE_POP || proto == MODEST_PROTOCOLS_STORE_IMAP)
                w = imap_pop_configuration (self);
-       else if (proto == MODEST_PROTOCOL_STORE_MAILDIR) 
+       else if (proto == MODEST_PROTOCOLS_STORE_MAILDIR) 
                w = maildir_configuration (self);
-       else if (proto == MODEST_PROTOCOL_STORE_MBOX)
+       else if (proto == MODEST_PROTOCOLS_STORE_MBOX)
                w = mbox_configuration (self);
        else
                w = gtk_label_new ("");
@@ -342,12 +343,12 @@ modest_store_widget_get_servername (ModestStoreWidget *self)
 }
 
 
-ModestTransportStoreProtocol
+ModestProtocolType
 modest_store_widget_get_proto (ModestStoreWidget *self)
 {
        ModestStoreWidgetPrivate *priv;
 
-       g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
+       g_return_val_if_fail (self, MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
 
        return priv->proto;
@@ -368,37 +369,42 @@ modest_store_widget_get_path (ModestStoreWidget *self)
                return NULL;
 }
 
-static gint
+static ModestProtocolType
 get_value_from_combo (GtkWidget *combo)
 {
        gchar *chosen;
+       ModestProtocol *proto;
+       const gchar *tag;
 
-       if (!combo)
-               return -1;
+       g_return_val_if_fail (combo, MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
 
        chosen = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
+       tag = MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS;
+       proto = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+                                                              tag,
+                                                              chosen);
 
-       return modest_protocol_info_get_transport_store_protocol (chosen);
+       return modest_protocol_get_type_id (proto);
 
 }
 
-ModestAuthProtocol
+ModestProtocolType
 modest_store_widget_get_auth (ModestStoreWidget *self)
 {
        ModestStoreWidgetPrivate *priv; 
 
-       g_return_val_if_fail (self, MODEST_PROTOCOL_AUTH_NONE);
+       g_return_val_if_fail (self, MODEST_PROTOCOLS_AUTH_NONE);
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
 
        return get_value_from_combo (priv->auth);
 }
 
-ModestConnectionProtocol
+ModestProtocolType
 modest_store_widget_get_security (ModestStoreWidget *self)
 {
        ModestStoreWidgetPrivate *priv; 
 
-       g_return_val_if_fail (self, MODEST_PROTOCOL_CONNECTION_NORMAL);
+       g_return_val_if_fail (self, MODEST_PROTOCOLS_CONNECTION_NONE);
        priv = MODEST_STORE_WIDGET_GET_PRIVATE(self);
 
        return get_value_from_combo (priv->security);
index 86c0dc8..3c86f4b 100644 (file)
@@ -31,7 +31,7 @@
 #define __MODEST_STORE_WIDGET_H__
 
 #include <gtk/gtkvbox.h>
-#include <modest-protocol-info.h>
+#include "modest-protocol.h"
 
 G_BEGIN_DECLS
 
@@ -60,14 +60,14 @@ struct _ModestStoreWidgetClass {
 /* member functions */
 GType           modest_store_widget_get_type    (void) G_GNUC_CONST;
 
-GtkWidget*      modest_store_widget_new         (ModestTransportStoreProtocol proto);
+GtkWidget*      modest_store_widget_new         (ModestProtocolType proto);
 
 const gchar*    modest_store_widget_get_username          (ModestStoreWidget *self);
 const gchar*    modest_store_widget_get_servername        (ModestStoreWidget *self);
-ModestTransportStoreProtocol  modest_store_widget_get_proto             (ModestStoreWidget *self);
 gchar *         modest_store_widget_get_path              (ModestStoreWidget *self);
-ModestAuthProtocol  modest_store_widget_get_auth              (ModestStoreWidget *self);
-ModestConnectionProtocol  modest_store_widget_get_security          (ModestStoreWidget *self);
+ModestProtocolType  modest_store_widget_get_proto             (ModestStoreWidget *self);
+ModestProtocolType  modest_store_widget_get_auth              (ModestStoreWidget *self);
+ModestProtocolType  modest_store_widget_get_security          (ModestStoreWidget *self);
 
 G_END_DECLS
 
index f1166e9..5fe18aa 100644 (file)
@@ -30,7 +30,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <widgets/modest-combo-box.h>
-#include <modest-protocol-info.h>
 #include "modest-transport-widget.h"
 #include <string.h>
 
@@ -49,7 +48,7 @@ enum {
 
 typedef struct _ModestTransportWidgetPrivate ModestTransportWidgetPrivate;
 struct _ModestTransportWidgetPrivate {
-       ModestTransportStoreProtocol proto;
+       ModestProtocolType proto;
        GtkWidget *servername;
        GtkWidget *username;
        GtkWidget *auth;
@@ -116,7 +115,7 @@ modest_transport_widget_init (ModestTransportWidget *obj)
        ModestTransportWidgetPrivate *priv;
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(obj); 
        
-       priv->proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+       priv->proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
 }
 
 static void
@@ -223,7 +222,7 @@ smtp_configuration (ModestTransportWidget *self)
 
 
 GtkWidget*
-modest_transport_widget_new (ModestTransportStoreProtocol proto)
+modest_transport_widget_new (ModestProtocolType proto)
 {
        GObject *obj;
        GtkWidget *w;
@@ -238,7 +237,7 @@ modest_transport_widget_new (ModestTransportStoreProtocol proto)
 
        priv->proto = proto;
        
-       if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) 
+       if (proto == MODEST_PROTOCOLS_TRANSPORT_SMTP) 
                w = smtp_configuration (self);
        else
                w = gtk_label_new ("");
@@ -295,12 +294,12 @@ modest_transport_widget_get_servername (ModestTransportWidget *self)
 }
 
 
-ModestTransportStoreProtocol
+ModestProtocolType
 modest_transport_widget_get_proto (ModestTransportWidget *self)
 {
        ModestTransportWidgetPrivate *priv;
 
-       g_return_val_if_fail (self, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
+       g_return_val_if_fail (self, MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
        priv = MODEST_TRANSPORT_WIDGET_GET_PRIVATE(self);
 
        return priv->proto;
index 10036c7..4e94973 100644 (file)
@@ -33,6 +33,7 @@
 G_BEGIN_DECLS
 
 #include <gtk/gtkvbox.h>
+#include "modest-protocol-registry.h"
 
 /* convenience macros */
 #define MODEST_TYPE_TRANSPORT_WIDGET             (modest_transport_widget_get_type())
@@ -59,13 +60,13 @@ struct _ModestTransportWidgetClass {
 /* member functions */
 GType        modest_transport_widget_get_type    (void) G_GNUC_CONST;
 
-GtkWidget*   modest_transport_widget_new         (ModestTransportStoreProtocol proto);
+GtkWidget*   modest_transport_widget_new         (ModestProtocolType proto);
 
 gboolean        modest_transport_widget_get_remember_password (ModestTransportWidget *self);
 gboolean        modest_transport_widget_get_requires_auth     (ModestTransportWidget *self);
 const gchar*    modest_transport_widget_get_username          (ModestTransportWidget *self);
 const gchar*    modest_transport_widget_get_servername        (ModestTransportWidget *self);
-ModestTransportStoreProtocol  modest_transport_widget_get_proto             (ModestTransportWidget *self);
+ModestProtocolType  modest_transport_widget_get_proto             (ModestTransportWidget *self);
 
 G_END_DECLS
 
index 263c514..eb41e84 100644 (file)
@@ -115,7 +115,6 @@ struct _ModestDefaultAccountSettingsDialogPrivate
        GtkWidget *entry_user_username;
        GtkWidget *entry_user_password;
        GtkWidget *entry_user_email;
-/*     GtkWidget *entry_incoming_port; */
        GtkWidget *button_signature;
        
        GtkWidget *page_complete_easysetup;
@@ -123,18 +122,9 @@ struct _ModestDefaultAccountSettingsDialogPrivate
        GtkWidget *page_incoming;
        GtkWidget *caption_incoming;
        GtkWidget *entry_incomingserver;
-/*     GtkWidget *combo_incoming_security; */
-/*     GtkWidget *checkbox_incoming_auth; */
 
        GtkWidget *page_outgoing;
        GtkWidget *entry_outgoingserver;
-/*     GtkWidget *caption_outgoing_username; */
-/*     GtkWidget *entry_outgoing_username; */
-/*     GtkWidget *caption_outgoing_password; */
-/*     GtkWidget *entry_outgoing_password; */
-/*     GtkWidget *combo_outgoing_security; */
-/*     GtkWidget *combo_outgoing_auth; */
-/*     GtkWidget *entry_outgoing_port; */
        GtkWidget *checkbox_outgoing_smtp_specific;
        GtkWidget *button_outgoing_smtp_servers;
        
index 50dba24..7a14bab 100644 (file)
@@ -34,8 +34,8 @@
 #define __MODEST_PROTOCOL_REGISTRY_H__
 
 #include <glib-object.h>
-#include <modest-protocol.h>
-#include <modest-pair.h>
+#include "modest-protocol.h"
+#include "modest-pair.h"
 
 G_BEGIN_DECLS
 
index 14abcb5..b6b8e9f 100644 (file)
@@ -62,7 +62,7 @@
 #include <modest-widget-memory.h>
 #include <modest-ui-actions.h>
 #include "modest-dnd.h"
-#include <modest-ui-constants.h>
+#include "modest-ui-constants.h"
 #include "widgets/modest-window.h"
 
 /* Folder view drag types */
index 5b6a948..c935740 100644 (file)
@@ -34,6 +34,7 @@
 #include <gtk/gtk.h>
 #include "modest-icon-names.h"
 #include "modest-ui-actions.h"
+#include "modest-defs.h"
 
 G_BEGIN_DECLS
 
index fa5cc0b..32ba7fa 100644 (file)
@@ -48,7 +48,6 @@
 #ifdef MODEST_TOOLKIT_HILDON2
 #define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH)
 #endif
-#define MODEST_FOLDER_PATH_SEPARATOR " / "
 #else /* MODEST_TOOLKIT_GTK */
 /* TODO: review this values with GNOME HIG */
 #define MODEST_MARGIN_DEFAULT 6
@@ -61,5 +60,6 @@
 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642
 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172
 #endif
+#define MODEST_FOLDER_PATH_SEPARATOR " / "
 
 #endif /*__MODEST_MAEMO_UI_CONSTANTS_H__*/
index 182b5a9..a7af0b6 100644 (file)
@@ -213,7 +213,9 @@ modest_validating_entry_new (void)
        
        entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
 
+#ifndef MODEST_TOOLKIT_GTK
        hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
+#endif
 
        return entry;
 }