* src/gnome/modest-account-view-window.c:
authorJose Dapena Paz <jdapena@igalia.com>
Wed, 12 Mar 2008 08:15:45 +0000 (08:15 +0000)
committerJose Dapena Paz <jdapena@igalia.com>
Wed, 12 Mar 2008 08:15:45 +0000 (08:15 +0000)
        * Check wether any connection is active, and cancel them if
          user wants to when we try to set the account.
* src/gnome/modest-msg-edit-window.c:
        * Added support for handling attachments (attachments view and
          attach button).
        * Added management of drafts and outbox messages. Keeps properly
          the current message uid.
        * Better layout of the recipients buttons.
        * Now body editor shows a box around.
        * Added support for dimming rules (fixes menus) and translations
          in menus.
* src/gnome/modest-platform.c:
        * Add stub implementation for double_connect_and_perform.
* src/gnome/Makefile.am:
        * Added gnome implementation for gnome account settings dialog.
* src/gnome/modest-account-settings-dialog.c:
        * Added. New gnome implementation for account settings dialog.
          With this we can begin to edit properly an account.
* src/gnome/modest-msg-edit-window-ui-dimming.h:
        * Dimming rules for gnome editor. Should be very similar to
          maemo counterpart.
* src/gnome/ui/modest-msg-edit-window-ui.xml:
        * Restructure the menu of the editor to get more or less the
          same features the maemo client has.
* Moved src/maemo/modest-account-settings-dialog.h to src/widgets. Also
  added .c in maemo.
* src/modest-tny-account-store.c:
        * Remove specific maemo implementation in account store. All the
          code should be common now.

pmo-trunk-r4296

12 files changed:
src/gnome/Makefile.am
src/gnome/modest-account-settings-dialog.c [new file with mode: 0644]
src/gnome/modest-account-view-window.c
src/gnome/modest-msg-edit-window-ui-dimming.h [new file with mode: 0644]
src/gnome/modest-msg-edit-window.c
src/gnome/modest-platform.c
src/gnome/ui/modest-msg-edit-window-ui.xml
src/maemo/Makefile.am
src/maemo/modest-account-settings-dialog.h [deleted file]
src/modest-tny-account-store.c
src/widgets/Makefile.am
src/widgets/modest-account-settings-dialog.h [new file with mode: 0644]

index ec75d4c..d4f1651 100644 (file)
@@ -24,6 +24,7 @@ PIXMAP_FILES=\
 libmodest_ui_la_SOURCES=              \
        modest-account-assistant.c    \
        modest-account-assistant.h    \
+       modest-account-settings-dialog.c \
        modest-account-view-window.c  \
        modest-address-book.c         \
        modest-msg-edit-window.c      \
diff --git a/src/gnome/modest-account-settings-dialog.c b/src/gnome/modest-account-settings-dialog.c
new file mode 100644 (file)
index 0000000..ac04625
--- /dev/null
@@ -0,0 +1,1616 @@
+/* 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);
+
+#define ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(o) \
+       (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialogPrivate))
+
+typedef struct _ModestAccountSettingsDialogPrivate ModestAccountSettingsDialogPrivate;
+
+struct _ModestAccountSettingsDialogPrivate
+{
+};
+
+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->specific_window)
+               gtk_widget_destroy (self->specific_window);
+               
+       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;
+       GtkAlignment *alignment;
+       
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+           
+       /* 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));
+       
+       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin), GTK_SHADOW_NONE);
+       gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (scrollwin)), GTK_SHADOW_NONE);
+       gtk_widget_show (scrollwin);
+
+       focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+       gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); 
+
+       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), scrollwin);
+       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;
+       GtkAlignment *alignment;
+       
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin), GTK_SHADOW_NONE);
+        
+       /* 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));
+       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box);
+       gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (scrollwin)), GTK_SHADOW_NONE);
+       gtk_widget_show (scrollwin);
+
+       focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+       gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); 
+       
+       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), scrollwin);
+       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);
+       GtkAlignment *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;
+       GtkAlignment *alignment;
+       
+       /* Put it all in a scrolled window, so that all widgets can be 
+        * accessed even when the on-screen keyboard is visible: */
+       GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), 
+               GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin), GTK_SHADOW_NONE);
+       
+       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));
+       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box);
+       gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (scrollwin)), GTK_SHADOW_NONE);
+       gtk_widget_show(scrollwin);
+
+       focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+       gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment);
+       
+       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), scrollwin);
+       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);
+}
+
+static void
+modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       g_type_class_add_private (klass, sizeof (ModestAccountSettingsDialogPrivate));
+
+
+       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 65db235..c71ad66 100644 (file)
@@ -193,10 +193,85 @@ on_remove_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
        }
 }
 
+/** Check whether any connections are active, and cancel them if 
+ * the user wishes.
+ * Returns TRUE is there was no problem, 
+ * or if an operation was cancelled so we can continue.
+ * Returns FALSE if the user chose to cancel his request instead.
+ */
+static gboolean
+check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name)
+{
+       ModestTnyAccountStore *acc_store;
+       ModestMailOperationQueue* queue;
+       TnyConnectionStatus store_conn_status, transport_conn_status;
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       gboolean retval = TRUE;
+
+       acc_store = modest_runtime_get_account_store ();
+       queue = modest_runtime_get_mail_operation_queue ();
+
+       store_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
+       transport_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_TRANSPORT);
+
+       store_conn_status = tny_account_get_connection_status (store_account);
+       transport_conn_status = tny_account_get_connection_status (transport_account);
+
+       if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
+           transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
+               gint response;
+
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+                                                               _("emev_nc_disconnect_account"));
+               if (response == GTK_RESPONSE_OK) {
+                       /* FIXME: We should only cancel those of this account */
+                       modest_mail_operation_queue_cancel_all (queue);
+
+                       /* Also disconnect the account */
+                       if (tny_account_get_connection_status (store_account) == TNY_CONNECTION_STATUS_CONNECTED) {
+                               tny_account_cancel (store_account);
+                               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+                                                             FALSE, NULL, NULL);
+                       }
+                       if (tny_account_get_connection_status (transport_account) == TNY_CONNECTION_STATUS_CONNECTED) {
+                               tny_account_cancel (transport_account);
+                               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+                                                             FALSE, NULL, NULL);
+                       }
+                       retval = TRUE;
+               } else {
+                       retval = FALSE;
+               }
+       }
+
+       /* Frees */
+       g_object_unref (store_account);
+       g_object_unref (transport_account);
+       
+       return retval;
+}
+
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
-       g_message (__FUNCTION__);
+       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
+       
+       gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
+       if (!account_name)
+               return;
+               
+       if (check_for_active_account (self, account_name)) {
+               modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
+               
+       }
+       
+       g_free (account_name);
 }
 
 static void
diff --git a/src/gnome/modest-msg-edit-window-ui-dimming.h b/src/gnome/modest-msg-edit-window-ui-dimming.h
new file mode 100644 (file)
index 0000000..6144a7b
--- /dev/null
@@ -0,0 +1,50 @@
+#ifndef __MODEST_MSG_EDIT_WINDOW_UI_DIMMING_PRIV_H__
+#define __MODEST_MSG_EDIT_WINDOW_UI_DIMMING_PRIV_H__
+
+#include "modest-dimming-rules-group.h"
+#include "modest-ui-dimming-rules.h"
+
+G_BEGIN_DECLS
+
+
+/* Menu Dimming rules entries */
+static const ModestDimmingEntry modest_msg_edit_window_menu_dimming_entries [] = {
+
+       /* Format Menu */
+       { "/MenuBar/FormatMenu/SelectFontMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/FormatMenu/AlignmentMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/FormatMenu/AlignmentLeftMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/FormatMenu/AlignmentRightMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/FormatMenu/AlignmentCenterMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/FormatMenu/InsertImageMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/EditMenu/SelectAllMenu", G_CALLBACK (modest_ui_dimming_rules_on_select_all) },      
+       { "/MenuBar/EditMenu/UndoMenu", G_CALLBACK (modest_ui_dimming_rules_on_undo) }, 
+       { "/MenuBar/EditMenu/RedoMenu", G_CALLBACK (modest_ui_dimming_rules_on_redo) }, 
+       { "/MenuBar/EditMenu/PasteMenu", G_CALLBACK (modest_ui_dimming_rules_on_editor_paste) },        
+       { "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu", G_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment) }, 
+       { "/MenuBar/AttachmentsMenu/InsertImageMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
+       { "/MenuBar/EmailMenu/SendMenu", G_CALLBACK (modest_ui_dimming_rules_on_send) },
+       { "/MenuBar/EmailMenu/SaveToDraftsMenu", G_CALLBACK (modest_ui_dimming_rules_on_save_to_drafts) },
+
+};
+
+/* Menu Dimming rules entries */
+static const ModestDimmingEntry modest_msg_edit_window_toolbar_dimming_entries [] = {
+
+       /* Toolbar */
+       { "/ToolBar/ToolbarSend", G_CALLBACK(modest_ui_dimming_rules_on_send) },
+       { "/ToolBar/ActionsBold", G_CALLBACK(modest_ui_dimming_rules_on_set_style) },
+       { "/ToolBar/ActionsItalics", G_CALLBACK(modest_ui_dimming_rules_on_set_style) },
+};
+
+/* Clipboard Dimming rules entries */
+static const ModestDimmingEntry modest_msg_edit_window_clipboard_dimming_entries [] = {
+
+       /* Toolbar */
+       { "/MenuBar/EditMenu/CutMenu", G_CALLBACK(modest_ui_dimming_rules_on_cut) },
+       { "/MenuBar/EditMenu/CopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },
+       { "/MenuBar/EditMenu/PasteMenu", G_CALLBACK(modest_ui_dimming_rules_on_editor_paste) },
+};
+
+G_END_DECLS
+#endif /* __MODEST_MSG_VIEW_WINDOW_UI_PRIV_H__ */
index 360147f..ecff6bb 100644 (file)
 #include <widgets/modest-msg-edit-window.h>
 #include <widgets/modest-msg-edit-window-ui.h>
 #include <widgets/modest-combo-box.h>
+#include <widgets/modest-attachments-view.h>
 
 #include <modest-widget-memory.h>
 #include <modest-account-mgr-helpers.h>
+#include <modest-tny-folder.h>
 #include <gtkhtml/gtkhtml.h>
+#include "modest-msg-edit-window-ui-dimming.h"
+#include <modest-platform.h>
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <tny-vfs-stream.h>
 
 static void  modest_msg_edit_window_class_init   (ModestMsgEditWindowClass *klass);
 static void  modest_msg_edit_window_init         (ModestMsgEditWindow *obj);
 static void  modest_msg_edit_window_finalize     (GObject *obj);
 
+static void  modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                                           ModestMsgEditWindow *window);
+static void update_next_cid (ModestMsgEditWindow *self, TnyList *attachments);
+
 /* list my signals */
 enum {
        /* MY_SIGNAL_1, */
@@ -70,6 +81,14 @@ struct _ModestMsgEditWindowPrivate {
        GtkWidget   *bcc_field;
        GtkWidget   *subject_field;
 
+       GtkWidget   *attachments_view;
+       TnyList     *attachments;
+       guint       next_cid;
+
+       TnyMsg      *draft_msg;
+       TnyMsg      *outbox_msg;
+       gchar       *msg_uid;
+
        gboolean    sent;
 };
 
@@ -153,7 +172,13 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj)
        priv->cc_field      = NULL;
        priv->bcc_field     = NULL;
        priv->subject_field = NULL;
+       priv->attachments_view = NULL;
+       priv->attachments = TNY_LIST (tny_simple_list_new ());
        priv->sent          = FALSE;
+       priv->next_cid      = 0;
+       priv->draft_msg = NULL;
+       priv->outbox_msg = NULL;
+       priv->msg_uid = NULL;
 }
 
 /** 
@@ -201,7 +226,7 @@ on_from_combo_changed (ModestComboBox *combo, ModestWindow *win)
 static void
 init_window (ModestMsgEditWindow *obj, const gchar* account)
 {
-       GtkWidget *to_button, *cc_button, *bcc_button; 
+       GtkWidget *to_button, *cc_button, *bcc_button, *add_attachment_button; 
        GtkWidget *header_table;
        GtkWidget *main_vbox;
        GtkWidget *msg_vbox;
@@ -215,6 +240,7 @@ init_window (ModestMsgEditWindow *obj, const gchar* account)
        to_button     = gtk_button_new_with_label (_("To..."));
        cc_button     = gtk_button_new_with_label (_("Cc..."));
        bcc_button    = gtk_button_new_with_label (_("Bcc..."));
+       add_attachment_button = gtk_button_new_with_label (_("Attach..."));
        
        /* Note: This ModestPairList* must exist for as long as the combo
         * that uses it, because the ModestComboBox uses the ID opaquely, 
@@ -234,22 +260,25 @@ init_window (ModestMsgEditWindow *obj, const gchar* account)
        priv->cc_field      = gtk_entry_new_with_max_length (80);
        priv->bcc_field     = gtk_entry_new_with_max_length (80);
        priv->subject_field = gtk_entry_new_with_max_length (80);
+       priv->attachments_view = modest_attachments_view_new (NULL);
        
-       header_table = gtk_table_new (5,2, FALSE);
+       header_table = gtk_table_new (6,2, FALSE);
        
        gtk_table_attach (GTK_TABLE(header_table), gtk_label_new (_("From:")),
-                         0,1,0,1, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), to_button,     0,1,1,2, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), cc_button,     0,1,2,3, GTK_SHRINK, 0, 0, 0);
-       gtk_table_attach (GTK_TABLE(header_table), bcc_button,    0,1,3,4, GTK_SHRINK, 0, 0, 0);
+                         0,1,0,1, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), to_button,     0,1,1,2, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), cc_button,     0,1,2,3, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), bcc_button,    0,1,3,4, GTK_FILL, 0, 0, 0);
        gtk_table_attach (GTK_TABLE(header_table), gtk_label_new (_("Subject:")),
-                         0,1,4,5, GTK_SHRINK, 0, 0, 0);
+                         0,1,4,5, GTK_FILL, 0, 0, 0);
+       gtk_table_attach (GTK_TABLE(header_table), add_attachment_button, 0, 1, 5, 6, GTK_FILL, 0, 0, 0);
 
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->from_field,   1,2,0,1);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->to_field,     1,2,1,2);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->cc_field,     1,2,2,3);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->bcc_field,    1,2,3,4);
        gtk_table_attach_defaults (GTK_TABLE(header_table), priv->subject_field,1,2,4,5);
+       gtk_table_attach_defaults (GTK_TABLE(header_table), priv->attachments_view,1,2,5,6);
 
        priv->msg_body = gtk_html_new ();
        gtk_html_load_empty (GTK_HTML (priv->msg_body));
@@ -258,19 +287,26 @@ init_window (ModestMsgEditWindow *obj, const gchar* account)
        main_vbox = gtk_vbox_new  (FALSE, 0);
 
        scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), 
+                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 0);
        
        msg_vbox = gtk_vbox_new (FALSE, 0);
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), msg_vbox); 
+       gtk_box_pack_start (GTK_BOX (main_vbox), msg_vbox, TRUE, TRUE, 0);
 
        gtk_box_pack_start (GTK_BOX(msg_vbox), header_table, FALSE, FALSE, 0);
-       gtk_box_pack_start (GTK_BOX(msg_vbox), priv->msg_body, TRUE, TRUE, 0);
+       gtk_container_add (GTK_CONTAINER (scrolled_window), priv->msg_body); 
+
+       gtk_box_pack_start (GTK_BOX(msg_vbox), scrolled_window, TRUE, TRUE, 0);
 
        gtk_widget_show_all (GTK_WIDGET(main_vbox));
        gtk_container_add (GTK_CONTAINER(obj), main_vbox);
+
+       g_signal_connect_object (add_attachment_button, "clicked", 
+                                G_CALLBACK (modest_msg_edit_window_add_attachment_clicked), G_OBJECT (obj), 0);
 }
 
 
@@ -281,10 +317,55 @@ modest_msg_edit_window_finalize (GObject *obj)
        
        /* These had to stay alive for as long as the comboboxes that used them: */
        modest_pair_list_free (priv->from_field_protos);
+       g_object_unref (priv->attachments);
+       priv->attachments = NULL;
+
+       if (priv->draft_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->draft_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->draft_msg);
+               priv->draft_msg = NULL;
+       }
+       if (priv->outbox_msg != NULL) {
+               TnyHeader *header = tny_msg_get_header (priv->outbox_msg);
+               if (TNY_IS_HEADER (header)) {
+                       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+                       modest_window_mgr_unregister_header (mgr, header);
+               }
+               g_object_unref (priv->outbox_msg);
+               priv->outbox_msg = NULL;
+       }
+       g_free (priv->msg_uid);
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+static void
+update_next_cid (ModestMsgEditWindow *self, TnyList *attachments)
+{
+       TnyIterator *iter;
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+       for (iter = tny_list_create_iterator (attachments) ; 
+            !tny_iterator_is_done (iter);
+            tny_iterator_next (iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (iter);
+               const gchar *cid = tny_mime_part_get_content_id (part);
+               if (cid != NULL) {
+                       char *invalid = NULL;
+                       gint int_cid = strtol (cid, &invalid, 10);
+                       if ((invalid != NULL) && (*invalid == '\0') && (int_cid >= priv->next_cid)) {
+                               priv->next_cid = int_cid + 1;
+                       }
+               }
+               g_object_unref (part);
+       }
+       g_object_unref (iter);
+}
+
 
 
 static gboolean
@@ -299,6 +380,7 @@ static void
 set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
 {
        TnyHeader *header;
+       TnyFolder *msg_folder;
        const gchar *to, *cc, *bcc, *subject;
        ModestMsgEditWindowPrivate *priv;
        gchar *body;
@@ -323,7 +405,10 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
 
-       
+       modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), msg);
+       priv->attachments = modest_attachments_view_get_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       update_next_cid (self, priv->attachments);
+
        body = modest_tny_msg_get_body (msg, FALSE, NULL);
        gtk_html_set_editable (GTK_HTML (priv->msg_body), FALSE);
        if (body) {
@@ -331,6 +416,30 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
        }
        gtk_html_set_editable (GTK_HTML (priv->msg_body), TRUE);
        g_free (body);
+
+       modest_msg_edit_window_set_modified (self, FALSE);
+
+       if (priv->msg_uid) {
+               g_free (priv->msg_uid);
+               priv->msg_uid = NULL;
+       }
+
+       /* we should set a reference to the incoming message if it is a draft */
+       msg_folder = tny_msg_get_folder (msg);
+       if (msg_folder) {               
+               if (modest_tny_folder_is_local_folder (msg_folder)) {
+                       TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
+                       if (type == TNY_FOLDER_TYPE_INVALID)
+                               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+                       
+                       if (type == TNY_FOLDER_TYPE_DRAFTS) 
+                               priv->draft_msg = g_object_ref(msg);
+                       if (type == TNY_FOLDER_TYPE_OUTBOX)
+                               priv->outbox_msg = g_object_ref(msg);
+                       priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
+               }
+               g_object_unref (msg_folder);
+       }
 }
 
 
@@ -342,6 +451,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account,
        ModestMsgEditWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
        GtkActionGroup *action_group;
+       ModestDimmingRulesGroup *menu_rules_group = NULL;
+       ModestDimmingRulesGroup *toolbar_rules_group = NULL;
+       ModestDimmingRulesGroup *clipboard_rules_group = NULL;
        GError *error = NULL;
 
        g_return_val_if_fail (msg, NULL);
@@ -352,6 +464,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account,
        
        parent_priv->ui_manager = gtk_ui_manager_new();
        action_group = gtk_action_group_new ("ModestMsgEditWindowActions");
+       gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
 
        /* Add common actions */
        gtk_action_group_add_actions (action_group,
@@ -397,6 +510,42 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account,
        g_signal_connect (G_OBJECT(self), "delete-event",
                          G_CALLBACK(on_delete_event), self);
        
+       parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new ();
+       menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE);
+       toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
+       clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
+
+       /* Add common dimming rules */
+       modest_dimming_rules_group_add_rules (menu_rules_group, 
+                                             modest_msg_edit_window_menu_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_menu_dimming_entries),
+                                             MODEST_WINDOW (self));
+       modest_dimming_rules_group_add_rules (toolbar_rules_group, 
+                                             modest_msg_edit_window_toolbar_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_toolbar_dimming_entries),
+                                             MODEST_WINDOW (self));
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_color_button, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_size_toolitem, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+/*     modest_dimming_rules_group_add_widget_rule (toolbar_rules_group, priv->font_face_toolitem, */
+/*                                                 G_CALLBACK (modest_ui_dimming_rules_on_set_style), */
+/*                                                 MODEST_WINDOW (self)); */
+       modest_dimming_rules_group_add_rules (clipboard_rules_group, 
+                                             modest_msg_edit_window_clipboard_dimming_entries,
+                                             G_N_ELEMENTS (modest_msg_edit_window_clipboard_dimming_entries),
+                                             MODEST_WINDOW (self));
+       /* Insert dimming rules group for this window */
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group);
+       modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group);
+        /* Checks the dimming rules */
+       g_object_unref (menu_rules_group);
+       g_object_unref (toolbar_rules_group);
+       g_object_unref (clipboard_rules_group);
+
        set_msg (self, msg);
        
        return MODEST_WINDOW(self);
@@ -422,6 +571,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        gchar *from_string = NULL;
        ModestMsgEditWindowPrivate *priv;
        GString *buffer;
+       TnyIterator *att_iter;
        
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
 
@@ -440,7 +590,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        
        data = g_slice_new0 (MsgData);
        data->from    =  from_string; /* will be freed when data is freed */
-       data->to      =  g_strdup (gtk_entry_get_text (GTK_ENTRY(priv->to_field)));
+       data->to      =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->to_field)));
        data->cc      =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->cc_field)));
        data->bcc     =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->bcc_field)));
        data->subject =  g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->subject_field)));
@@ -457,9 +607,42 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
        gtk_html_export (GTK_HTML (priv->msg_body), "text/plain", (GtkHTMLSaveReceiverFn) html_export_save_buffer, &buffer);
        data->plain_body = g_string_free (buffer, FALSE);
 
+       /* deep-copy the attachment data */
+       att_iter = tny_list_create_iterator (priv->attachments);
+       data->attachments = NULL;
+       while (!tny_iterator_is_done (att_iter)) {
+               TnyMimePart *part = (TnyMimePart *) tny_iterator_get_current (att_iter);
+               if (!(TNY_IS_MIME_PART(part))) {
+                       g_warning ("strange data in attachment list");
+                       g_object_unref (part);
+                       tny_iterator_next (att_iter);
+                       continue;
+               }
+               data->attachments = g_list_append (data->attachments,
+                                                  part);
+               tny_iterator_next (att_iter);
+       }
+       g_object_unref (att_iter);
+
+
+       if (priv->draft_msg) {
+               data->draft_msg = g_object_ref (priv->draft_msg);
+       } else if (priv->outbox_msg) {
+               data->draft_msg = g_object_ref (priv->outbox_msg);
+       } else {
+               data->draft_msg = NULL;
+       }
        return data;
 }
 
+static void
+unref_gobject (GObject *obj, gpointer data)
+{
+       if (!G_IS_OBJECT(obj))
+               return;
+       g_object_unref (obj);
+}
+
 void 
 modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
                                      MsgData *data)
@@ -476,7 +659,13 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
        g_free (data->plain_body);
        g_free (data->html_body);
 
-       /* TODO: Free data->attachments? */
+       if (data->draft_msg != NULL) {
+               g_object_unref (data->draft_msg);
+               data->draft_msg = NULL;
+       }       
+       
+       g_list_foreach (data->attachments, (GFunc)unref_gobject,  NULL);
+       g_list_free (data->attachments);
 
        g_slice_free (MsgData, data);
 }
@@ -579,9 +768,86 @@ void
 modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
                                           TnyList *att_list)
 {
-       g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+       ModestMsgEditWindowPrivate *priv;
+       TnyIterator *iter;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       if (att_list == NULL) {
+               att_list = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       } else {
+               g_object_ref (att_list);
+       }
+
+       if (tny_list_get_length (att_list) == 0) {
+               modest_platform_information_banner (NULL, NULL, _("TODO: no attachments selected to remove"));
+       } else {
+               GtkWidget *confirmation_dialog = NULL;
+               gboolean dialog_response;
+               gchar *message = NULL;
+               gchar *filename = NULL;
+
+               if (tny_list_get_length (att_list) == 1) {
+                       TnyMimePart *part;
+                       iter = tny_list_create_iterator (att_list);
+                       part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       g_object_unref (iter);
+                       if (TNY_IS_MSG (part)) {
+                               TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
+                               if (header) {
+                                       filename = g_strdup (tny_header_get_subject (header));
+                                       g_object_unref (header);
+                               }
+                               if (filename == NULL) {
+                                       filename = g_strdup (_("mail_va_no_subject"));
+                               }
+                       } else {
+                               filename = g_strdup (tny_mime_part_get_filename (TNY_MIME_PART (part)));
+                       }
+                       g_object_unref (part);
+               } else {
+                       filename = g_strdup ("");
+               }
+               message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments",
+                                                   (tny_list_get_length (att_list) == 1)), filename);
+               g_free (filename);
+               confirmation_dialog = gtk_message_dialog_new (GTK_WINDOW (window), 
+                                                             GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+                                                             GTK_MESSAGE_QUESTION,
+                                                             GTK_BUTTONS_OK_CANCEL,
+                                                             message);
+               g_free (message);
+               dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK);
+               gtk_widget_destroy (confirmation_dialog);
+               if (!dialog_response) {
+                       g_object_unref (att_list);
+                       return;
+               }
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment"));
+               
+               for (iter = tny_list_create_iterator (att_list);
+                    !tny_iterator_is_done (iter);
+                    tny_iterator_next (iter)) {
+                       TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
+                       tny_list_remove (priv->attachments, (GObject *) mime_part);
+
+                       modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                                  mime_part);
+                       g_object_unref (mime_part);
+               }
+               g_object_unref (iter);
+       }
+
+       g_object_unref (att_list);
 
-       g_message ("Remove attachments operation is not supported");
+}
+
+static void
+modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
+                                              ModestMsgEditWindow *window)
+{
+       modest_msg_edit_window_offer_attach_file (window);
 }
 
 void 
@@ -589,8 +855,12 @@ modest_msg_edit_window_get_parts_size (ModestMsgEditWindow *window,
                                       gint *parts_count,
                                       guint64 *parts_size)
 {
-       *parts_count = 0;
-       *parts_size = 0;
+       ModestMsgEditWindowPrivate *priv;
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), parts_count, parts_size);
+
 }
 
 void
@@ -704,7 +974,7 @@ modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win,
                return priv->subject_field;
                break;
        case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS:
-               return NULL;
+               return priv->attachments_view;
                break;
        default:
                return NULL;
@@ -732,7 +1002,11 @@ void
 modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
                                 TnyMimePart *part)
 {
-       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+       ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       g_return_if_fail (TNY_IS_MIME_PART (part));
+       tny_list_prepend (priv->attachments, (GObject *) part);
+       modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part, TRUE, 0);
 }
 
 void            
@@ -744,20 +1018,133 @@ modest_msg_edit_window_redo               (ModestMsgEditWindow *window)
 void                    
 modest_msg_edit_window_offer_attach_file           (ModestMsgEditWindow *window)
 {
-       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+       GtkWidget *dialog = NULL;
+       gint response = 0;
+       GSList *uris = NULL;
+       GSList *uri_node;
+       
+       dialog = gtk_file_chooser_dialog_new (_("mcen_ti_select_attachment_title"), 
+                                             GTK_WINDOW (window), 
+                                             GTK_FILE_CHOOSER_ACTION_OPEN,
+                                             GTK_STOCK_OPEN,
+                                             GTK_RESPONSE_OK,
+                                             GTK_STOCK_CANCEL,
+                                             GTK_RESPONSE_CANCEL,
+                                             NULL);
+
+       response = gtk_dialog_run (GTK_DIALOG (dialog));
+       switch (response) {
+       case GTK_RESPONSE_OK:
+               uris = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (dialog));
+               break;
+       default:
+               break;
+       }
+       gtk_widget_destroy (dialog);
+
+       for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
+               const gchar *uri = (const gchar *) uri_node->data;
+               modest_msg_edit_window_attach_file_one (window, uri);
+       }
+       g_slist_foreach (uris, (GFunc) g_free, NULL);
+       g_slist_free (uris);
 }
 
 void                    
-modest_msg_edit_window_attach_file_one           (ModestMsgEditWindow *window, const gchar *file_uri)
+modest_msg_edit_window_attach_file_one           (ModestMsgEditWindow *window, const gchar *uri)
 {
-       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+       GnomeVFSHandle *handle = NULL;
+       ModestMsgEditWindowPrivate *priv;
+       GnomeVFSResult result;
+
+       g_return_if_fail (window);
+       g_return_if_fail (uri);
+               
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       
+       result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+       if (result == GNOME_VFS_OK) {
+               TnyMimePart *mime_part;
+               TnyStream *stream;
+               const gchar *mime_type = NULL;
+               gchar *basename;
+               gchar *escaped_filename;
+               gchar *filename;
+               gchar *content_id;
+               GnomeVFSFileInfo *info;
+               GnomeVFSURI *vfs_uri;
+
+               vfs_uri = gnome_vfs_uri_new (uri);
+
+               escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+               filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+               g_free (escaped_filename);
+               gnome_vfs_uri_unref (vfs_uri);
+
+               info = gnome_vfs_file_info_new ();
+               
+               if (gnome_vfs_get_file_info (uri, 
+                                            info, 
+                                            GNOME_VFS_FILE_INFO_GET_MIME_TYPE)
+                   == GNOME_VFS_OK)
+                       mime_type = gnome_vfs_file_info_get_mime_type (info);
+               mime_part = tny_platform_factory_new_mime_part
+                       (modest_runtime_get_platform_factory ());
+               stream = TNY_STREAM (tny_vfs_stream_new (handle));
+               
+               tny_mime_part_construct (mime_part, stream, mime_type, "base64");
+
+               g_object_unref (stream);
+               
+               content_id = g_strdup_printf ("%d", priv->next_cid);
+               tny_mime_part_set_content_id (mime_part, content_id);
+               g_free (content_id);
+               priv->next_cid++;
+               
+               basename = g_path_get_basename (filename);
+               tny_mime_part_set_filename (mime_part, basename);
+               g_free (basename);
+               
+               tny_list_prepend (priv->attachments, (GObject *) mime_part);
+               modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                                       mime_part,
+                                                       info->size == 0, info->size);
+               g_free (filename);
+               g_object_unref (mime_part);
+               gnome_vfs_file_info_unref (info);
+       }
 }
 
 void            
 modest_msg_edit_window_set_draft           (ModestMsgEditWindow *window,
                                            TnyMsg *draft)
 {
-       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+       ModestMsgEditWindowPrivate *priv;
+       TnyHeader *header = NULL;
+
+       g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+       g_return_if_fail ((draft == NULL)||(TNY_IS_MSG (draft)));
+
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+       ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+       if (priv->draft_msg != NULL) {
+               g_object_unref (priv->draft_msg);
+       }
+
+       if (draft != NULL) {
+               g_object_ref (draft);
+               header = tny_msg_get_header (draft);
+               if (priv->msg_uid) {
+                       g_free (priv->msg_uid);
+                       priv->msg_uid = NULL;
+               }
+               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));
+       }
+
+       priv->draft_msg = draft;
 }
 
 gboolean        
@@ -790,6 +1177,10 @@ modest_msg_edit_window_can_undo               (ModestMsgEditWindow *window)
 const gchar*    
 modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
 {
-       g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
-       return NULL;
+       ModestMsgEditWindowPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), NULL);        
+       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+       return priv->msg_uid;
 }
index 9e2f76b..39bf4d4 100644 (file)
@@ -410,6 +410,16 @@ modest_platform_connect_and_perform (GtkWindow *parent_window,
 }
 
 void 
+modest_platform_double_connect_and_perform (GtkWindow *parent_window, 
+                                           gboolean force,
+                                           TnyFolderStore *folder_store,
+                                           DoubleConnectionInfo *connect_info)
+{
+       if (connect_info->callback)
+               connect_info->callback (FALSE, NULL, parent_window, folder_store, connect_info->data);
+}
+
+void 
 modest_platform_connect_and_perform_if_network_account (GtkWindow *parent_window, 
                                                        gboolean force,
                                                        TnyAccount *account,
index a3dde1a..e5a2ca8 100644 (file)
 
   <menubar name="MenuBar">
 
+    <menu name="EmailMenu" action="Email">
+      <menuitem name="SendMenu" action="ActionsSend"/>
+      <menuitem name="SaveToDraftsMenu" action="ActionsSaveToDrafts"/>
+      <separator/>
+      <menuitem name="SelectContactsMenu" action="SelectContacts"/>
+      <menuitem name="CheckNamesMenu" action="CheckNames"/>
+      <separator/>
+      <menuitem name="NewMessageMenu" action="ActionsNewMessage"/>
+      <separator/>
+      <menuitem name="CloseWindowMenu" action="CloseWindow"/>
+      <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
+    </menu>
+
     <menu name="EditMenu" action="Edit">
+      <menuitem name="UndoMenu" action="Undo"/>
+      <menuitem name="RedoMenu" action="Redo"/>
+      <separator/>
       <menuitem name="CutMenu" action="Cut"/>
       <menuitem name="CopyMenu" action="Copy"/>
       <menuitem name="PasteMenu" action="Paste"/>
     </menu>
 
     <menu name="ViewMenu" action="View">
-      <menuitem name="ViewToFieldMenu"  action="ViewToField"/>
-      <menuitem name="ViewCcFieldMenu"  action="ViewCcField"/>
+      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
+      <separator/>
+      <menu name="ShowToolbarMenu" action="ShowToolbar">
+       <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
+       <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
+      </menu>
+      <separator/>
+      <menuitem name="ViewCcFieldMenu" action="ViewCcField"/>
       <menuitem name="ViewBccFieldMenu" action="ViewBccField"/>
     </menu>
 
+    <menu name="FormatMenu" action="Format">
+      <menuitem name="SelectFontMenu" action="SelectFont"/>
+<!--      <menuitem name="BulletedListMenu" action="ActionsBulletedList"/> -->
+      <menu name="AlignmentMenu" action="Alignment">
+         <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
+         <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
+         <menuitem name="AlignmentRightMenu" action="AlignmentRight"/>
+      </menu>
+      <separator/>
+      <menu name="FileFormatMenu" action="FileFormat">
+       <menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
+       <menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
+      </menu>
+    </menu>
+
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="AttachFileMenu" action="AttachFile"/>
+      <menuitem name="InsertImageMenu" action="InsertImage"/>
+      <separator/>
+      <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
+    </menu>
+
+    <menu name="ToolsMenu" action="Tools">
+      <menu name="MessagePriorityMenu" action="MessagePriority">
+       <menuitem name="MessagePriorityHighMenu" action="MessagePriorityHigh"/>
+       <menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
+       <menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
+      </menu>
+      <separator/>
+      <menuitem name="FindInMessageMenu" action="FindInMessage"/>
+      <menuitem name="ToolSearchMessagesMenu" action="SearchMessages"/>
+      <separator/>
+      <menuitem name="ToolsHelpMenu" action="Help"/>
+    </menu>
+
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ActionsSend"/>
+    <toolitem action="ToolbarSend"/>
+    <separator/>
+    <placeholder name="FontAttributes" />
+    <toolitem action="ActionsBold"/>
+    <toolitem action="ActionsItalics"/>
+    <placeholder name="FontColor" />
   </toolbar>
 
+  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
+  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
+  <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
+
 </ui>
index 9e4a488..f55596d 100644 (file)
@@ -52,6 +52,7 @@ noinst_LTLIBRARIES=\
 
 libmodest_ui_la_SOURCES=              \
        modest-account-view-window.c  \
+       modest-account-settings-dialog.c \
        modest-icon-names.h           \
        modest-maemo-global-settings-dialog.c \
        modest-maemo-global-settings-dialog.h \
@@ -64,8 +65,6 @@ libmodest_ui_la_SOURCES=              \
        modest-msg-view-window.c      \
        modest-msg-edit-window.c      \
        modest-maemo-utils.c          \
-       modest-account-settings-dialog.h \
-       modest-account-settings-dialog.c \
        modest-connection-specific-smtp-window.h \
        modest-connection-specific-smtp-window.c \
        modest-connection-specific-smtp-edit-window.h \
diff --git a/src/maemo/modest-account-settings-dialog.h b/src/maemo/modest-account-settings-dialog.h
deleted file mode 100644 (file)
index 5e6bd1c..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (c) 2007, Nokia Corporation
- * All rights reserved.
- *
- */
-
-#ifndef _MODEST_ACCOUNT_SETTINGS_DIALOG
-#define _MODEST_ACCOUNT_SETTINGS_DIALOG
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtknotebook.h>
-#include "modest-account-mgr.h"
-
-G_BEGIN_DECLS
-
-#define MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG modest_account_settings_dialog_get_type()
-
-#define MODEST_ACCOUNT_SETTINGS_DIALOG(obj) \
-       (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialog))
-
-#define MODEST_ACCOUNT_SETTINGS_DIALOG_CLASS(klass) \
-       (G_TYPE_CHECK_CLASS_CAST ((klass), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialogClass))
-
-#define MODEST_IS_ACCOUNT_SETTINGS_DIALOG(obj) \
-       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG))
-
-#define MODEST_IS_ACCOUNT_SETTINGS_DIALOG_CLASS(klass) \
-       (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG))
-
-#define MODEST_ACCOUNT_SETTINGS_DIALOG_GET_CLASS(obj) \
-       (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialogClass))
-
-typedef struct {
-       GtkDialog parent;
-       
-       /* Used by derived widgets to query existing accounts,
-        * and to create new accounts: */
-       ModestAccountMgr *account_manager;
-       ModestAccountSettings *settings;
-       
-       gboolean modified;
-       gboolean save_password;
-       gchar * account_name; /* This may not change. It is not user visible. */
-       ModestTransportStoreProtocol incoming_protocol; /* This may not change. */
-       ModestTransportStoreProtocol outgoing_protocol; /* This may not change. */
-       gchar * original_account_title;
-
-       ModestAuthProtocol 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 *specific_window;
-       GtkWidget *signature_dialog;
-       
-} ModestAccountSettingsDialog;
-
-typedef struct {
-       GtkDialogClass parent_class;
-       
-} ModestAccountSettingsDialogClass;
-
-GType modest_account_settings_dialog_get_type (void);
-
-ModestAccountSettingsDialog* modest_account_settings_dialog_new (void);
-
-void modest_account_settings_dialog_set_account (ModestAccountSettingsDialog *dialog, ModestAccountSettings *settings);
-
-void modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog);
-
-void modest_account_settings_dialog_set_modified (ModestAccountSettingsDialog *dialog, gboolean modified);
-
-void modest_account_settings_dialog_save_password (ModestAccountSettingsDialog *dialog);
-
-G_END_DECLS
-
-#endif /* _MODEST_ACCOUNT_SETTINGS_DIALOG */
index ac14b62..a9459cd 100644 (file)
 #include <camel/camel.h>
 #include <modest-platform.h>
 #include "modest-ui-actions.h"
+#include <widgets/modest-account-settings-dialog.h>
 
 #ifdef MODEST_PLATFORM_MAEMO
 #include <tny-maemo-conic-device.h>
 #include <maemo/modest-maemo-utils.h>
-#include <maemo/modest-account-settings-dialog.h>
 #endif
 
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
@@ -126,9 +126,7 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
        gchar              *cache_dir;  
        GHashTable         *password_hash;
-#ifdef MODEST_PLATFORM_MAEMO
        GHashTable         *account_settings_dialog_hash;
-#endif
        ModestAccountMgr   *account_mgr;
        TnySessionCamel    *session;
        TnyDevice          *device;
@@ -276,12 +274,10 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
        priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                     g_free, g_free);
 
-#ifdef MODEST_PLATFORM_MAEMO                                                        
        /* A hash-map of modest account names to dialog pointers,
         * so we can avoid showing the account settings twice for the same modest account: */                                 
        priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, 
                                                                    g_free, NULL);
-#endif
        
        /* Respond to volume mounts and unmounts, such 
         * as the insertion/removal of the memory card: */
@@ -492,7 +488,6 @@ on_account_changed (ModestAccountMgr *acc_mgr,
                g_object_unref (iter);
 }
 
-#ifdef MODEST_PLATFORM_MAEMO
 static void 
 on_account_settings_hide (GtkWidget *widget, gpointer user_data)
 {
@@ -504,7 +499,6 @@ on_account_settings_hide (GtkWidget *widget, gpointer user_data)
        if (account_name)
                g_hash_table_remove (priv->account_settings_dialog_hash, account_name);
 }
-#endif
 
 static void 
 show_password_warning_only ()
@@ -520,7 +514,6 @@ show_password_warning_only ()
                g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect"));
 }
 
-#ifdef MODEST_PLATFORM_MAEMO
 static void 
 show_wrong_password_dialog (TnyAccount *account)
 { 
@@ -544,11 +537,9 @@ show_wrong_password_dialog (TnyAccount *account)
        }
        
        dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name);
-       modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
        /* Show an explanatory temporary banner: */
        modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
 }
-#endif
 
 /* This callback will be called by Tinymail when it needs the password
  * from the user or the account settings.
@@ -630,9 +621,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                );
                if (settings_have_password) {
                        /* The password must be wrong, so show the account settings dialog so it can be corrected: */
-#ifdef MODEST_PLATFORM_MAEMO
                        show_wrong_password_dialog (account);
-#endif
                        
                        if (cancel)
                                *cancel = TRUE;
@@ -763,12 +752,10 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->password_hash = NULL;
        }
 
-#ifdef MODEST_PLATFORM_MAEMO
        if (priv->account_settings_dialog_hash) {
                g_hash_table_destroy (priv->account_settings_dialog_hash);
                priv->account_settings_dialog_hash = NULL;
        }
-#endif
 
        if (priv->outbox_of_transport) {
                g_hash_table_destroy (priv->outbox_of_transport);
index 225375d..b5b314d 100644 (file)
@@ -20,6 +20,7 @@ noinst_LTLIBRARIES=\
 
 libmodest_widgets_la_SOURCES=          \
        modest-account-view-window.h   \
+       modest-account-settings-dialog.h \
        modest-account-view.c          \
        modest-account-view.h          \
        modest-attachment-view.c       \
diff --git a/src/widgets/modest-account-settings-dialog.h b/src/widgets/modest-account-settings-dialog.h
new file mode 100644 (file)
index 0000000..5e6bd1c
--- /dev/null
@@ -0,0 +1,115 @@
+/* Copyright (c) 2007, Nokia Corporation
+ * All rights reserved.
+ *
+ */
+
+#ifndef _MODEST_ACCOUNT_SETTINGS_DIALOG
+#define _MODEST_ACCOUNT_SETTINGS_DIALOG
+
+#include <gtk/gtkdialog.h>
+#include <gtk/gtknotebook.h>
+#include "modest-account-mgr.h"
+
+G_BEGIN_DECLS
+
+#define MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG modest_account_settings_dialog_get_type()
+
+#define MODEST_ACCOUNT_SETTINGS_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialog))
+
+#define MODEST_ACCOUNT_SETTINGS_DIALOG_CLASS(klass) \
+       (G_TYPE_CHECK_CLASS_CAST ((klass), \
+       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialogClass))
+
+#define MODEST_IS_ACCOUNT_SETTINGS_DIALOG(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG))
+
+#define MODEST_IS_ACCOUNT_SETTINGS_DIALOG_CLASS(klass) \
+       (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG))
+
+#define MODEST_ACCOUNT_SETTINGS_DIALOG_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG, ModestAccountSettingsDialogClass))
+
+typedef struct {
+       GtkDialog parent;
+       
+       /* Used by derived widgets to query existing accounts,
+        * and to create new accounts: */
+       ModestAccountMgr *account_manager;
+       ModestAccountSettings *settings;
+       
+       gboolean modified;
+       gboolean save_password;
+       gchar * account_name; /* This may not change. It is not user visible. */
+       ModestTransportStoreProtocol incoming_protocol; /* This may not change. */
+       ModestTransportStoreProtocol outgoing_protocol; /* This may not change. */
+       gchar * original_account_title;
+
+       ModestAuthProtocol 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 *specific_window;
+       GtkWidget *signature_dialog;
+       
+} ModestAccountSettingsDialog;
+
+typedef struct {
+       GtkDialogClass parent_class;
+       
+} ModestAccountSettingsDialogClass;
+
+GType modest_account_settings_dialog_get_type (void);
+
+ModestAccountSettingsDialog* modest_account_settings_dialog_new (void);
+
+void modest_account_settings_dialog_set_account (ModestAccountSettingsDialog *dialog, ModestAccountSettings *settings);
+
+void modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog);
+
+void modest_account_settings_dialog_set_modified (ModestAccountSettingsDialog *dialog, gboolean modified);
+
+void modest_account_settings_dialog_save_password (ModestAccountSettingsDialog *dialog);
+
+G_END_DECLS
+
+#endif /* _MODEST_ACCOUNT_SETTINGS_DIALOG */