2007-04-06 Murray Cumming <murrayc@murrayc.com>
authorMurray Cumming <murrayc@murrayc.com>
Fri, 6 Apr 2007 08:21:32 +0000 (08:21 +0000)
committerMurray Cumming <murrayc@murrayc.com>
Fri, 6 Apr 2007 08:21:32 +0000 (08:21 +0000)
* src/maemo/Makefile.am:
        * src/maemo/modest-account-settings-dialog.c:
        * src/maemo/modest-account-settings-dialog.h: The beginnings of the dialog to edit
        an existing account. Doesn't do much yet.

        * src/maemo/modest-account-view-window.c: (on_edit_button_clicked):
        Open the accounts settings dialog when Edit is clicked.

pmo-trunk-r1520

ChangeLog2
src/maemo/Makefile.am
src/maemo/easysetup/modest-easysetup-wizard.c
src/maemo/modest-account-settings-dialog.c [new file with mode: 0644]
src/maemo/modest-account-settings-dialog.h [new file with mode: 0644]
src/maemo/modest-account-settings-window.c [deleted file]
src/maemo/modest-account-settings-window.h [deleted file]
src/maemo/modest-account-view-window.c

index e46701d..dad553d 100644 (file)
@@ -1,3 +1,13 @@
+2007-04-06  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/maemo/Makefile.am:
+       * src/maemo/modest-account-settings-dialog.c:
+       * src/maemo/modest-account-settings-dialog.h: The beginnings of the dialog to edit 
+       an existing account. Doesn't do much yet.
+       
+       * src/maemo/modest-account-view-window.c: (on_edit_button_clicked): 
+       Open the accounts settings dialog when Edit is clicked.
+
 2007-04-05  Murray Cumming  <murrayc@murrayc.com>
 
        * src/maemo/easysetup/Makefile.am:
index 5b3ae5c..4cd6edc 100644 (file)
@@ -57,8 +57,8 @@ libmodest_ui_la_SOURCES=              \
        modest-msg-view-window.c      \
        modest-msg-edit-window.c      \
        modest-maemo-utils.c          \
-       modest-account-settings-window.h \
-       modest-account-settings-window.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 \
index 9567a88..661f6ae 100644 (file)
@@ -101,6 +101,8 @@ create_subsequent_easysetup_pages (ModestEasysetupWizardDialog *self);
 static void
 set_default_custom_servernames(ModestEasysetupWizardDialog *dialog);
 
+static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data);
+
 static gchar*
 util_increment_name (const gchar* text);
 
@@ -482,7 +484,7 @@ static void update_incoming_server_security_choices (ModestEasysetupWizardDialog
                EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
 }
 
-void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data)
+static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data)
 {
        ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
        update_incoming_server_title (self);
@@ -875,7 +877,7 @@ static void create_subsequent_pages (ModestEasysetupWizardDialog *self)
        }
 }
 
-gchar*
+static gchar*
 util_get_default_servername_from_email_address (const gchar* email_address, ModestProtocol servertype)
 {
        if (!email_address)
diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
new file mode 100644 (file)
index 0000000..14be7c4
--- /dev/null
@@ -0,0 +1,1023 @@
+/* Copyright (c) 2007, Nokia Corporation
+ * All rights reserved.
+ *
+ */
+
+
+#include "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 <hildon-widgets/hildon-caption.h>
+#include "maemo/easysetup/modest-easysetup-country-combo-box.h"
+#include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
+#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
+#include "maemo/easysetup/modest-easysetup-serversecurity-combo-box.h"
+#include "maemo/easysetup/modest-easysetup-secureauth-combo-box.h"
+#include "maemo/easysetup/modest-validating-entry.h"
+#include "modest-text-utils.h"
+#include "modest-account-mgr.h"
+#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
+#include "maemo/modest-connection-specific-smtp-window.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 EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
+
+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
+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_manager)
+               g_object_unref (G_OBJECT (self->account_manager));
+       
+       G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
+}
+
+#if 0
+static void
+show_error (GtkWindow *parent_window, const gchar* text);
+#endif
+
+static void
+set_default_custom_servernames(ModestAccountSettingsDialog *dialog);
+
+static gchar*
+util_increment_name (const gchar* text);
+
+static void
+enable_buttons (ModestAccountSettingsDialog *self)
+{
+}
+
+static void
+on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       g_assert(self);
+       enable_buttons(self);
+}
+
+static void
+on_caption_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 caption containing a mandatory widget.
+ * When the widget is edited, the enable_buttons() vfunc will be called.
+ */
+static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *self,
+       GtkSizeGroup *group,
+       const gchar *value,
+       GtkWidget *control,
+       GtkWidget *icon,
+       HildonCaptionStatus flag)
+{
+  GtkWidget *caption = hildon_caption_new (group, value, control, icon, flag);
+  
+/* The translated strings seem to already contain the *,
+ * but this code can be used if that is not true in future.
+ */
+#if 0
+       /* Add a * character to indicate mandatory fields,
+        * as specified in our "Email UI Specification": */
+       if (flag == HILDON_CAPTION_MANDATORY) {
+               gchar* title = g_strdup_printf("%s*", value);
+               caption = hildon_caption_new (group, title, control, icon, flag);       
+               g_free(title);
+       }       
+       else
+               caption = hildon_caption_new (group, value, control, icon, flag);
+#endif
+
+       /* 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_caption_entry_changed), self);
+               
+       }
+       else if (GTK_IS_COMBO_BOX (control)) {
+               g_signal_connect (G_OBJECT (control), "changed",
+               G_CALLBACK (on_caption_combobox_changed), self);
+       }
+        
+       return caption;
+}
+
+static GtkWidget*
+create_page_account_details (ModestAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, 2);
+       GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
+       gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 2);
+       gtk_widget_show (label);
+       
+       /* Create a size group to be used by all captions.
+        * Note that HildonCaption does not create a default size group if we do not specify one.
+        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+           
+               
+       /* The description widgets: */  
+       self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ());
+       
+       /* Set a default account title, choosing one that does not already exist: */
+       gchar* default_acount_name = g_strdup (_("mcen_ia_emailsetup_defaultname"));
+       while (modest_account_mgr_account_exists (self->account_manager, 
+               default_acount_name, FALSE /*  server_account */)) {
+                       
+               gchar * default_account_name2 = util_increment_name (default_acount_name);
+               g_free (default_acount_name);
+               default_acount_name = default_account_name2;
+       }
+       
+       gtk_entry_set_text( GTK_ENTRY (self->entry_account_title), default_acount_name);
+       g_free (default_acount_name);
+       default_acount_name = NULL;
+
+       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"), 
+               self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
+       gtk_widget_show (self->entry_account_title);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* 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, "\""); /* The UI spec mentions “, but maybe means ", maybe both. */
+       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, "^");       
+       easysetup_validating_entry_set_unallowed_characters (
+               EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
+       g_list_free (list_prevent);
+       
+       /* Set max length as in the UI spec:
+        * TODO: 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);
+       
+       gtk_widget_show (GTK_WIDGET (box));
+       
+       return GTK_WIDGET (box);
+}
+
+static GtkWidget*
+create_page_user_details (ModestAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, 2);
+       
+       /* Create a size group to be used by all captions.
+        * Note that HildonCaption does not create a default size group if we do not specify one.
+        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
+       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+        
+       /* The name widgets: */
+       self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ());
+       /* Set max length as in the UI spec:
+        * TODO: 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);
+       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+               _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->entry_user_name);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* 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, ">");
+       easysetup_validating_entry_set_unallowed_characters (
+               EASYSETUP_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
+       g_list_free (list_prevent);
+       
+       /* The username widgets: */     
+       self->entry_user_username = GTK_WIDGET (easysetup_validating_entry_new ());
+       caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
+               self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
+       gtk_widget_show (self->entry_user_username);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* Prevent the use of some characters in the username, 
+        * as required by our UI specification: */
+       easysetup_validating_entry_set_unallowed_characters_whitespace (
+               EASYSETUP_VALIDATING_ENTRY (self->entry_user_username));
+       
+       /* Set max length as in the UI spec:
+        * TODO: 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);
+       
+       /* 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), '*'); */
+       caption = create_caption_new_with_asterix (self, sizegroup, 
+               _("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->entry_user_password);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* The email address widgets: */        
+       self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ());
+       caption = create_caption_new_with_asterix (self, sizegroup, 
+               _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
+       gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
+       gtk_widget_show (self->entry_user_email);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* Set max length as in the UI spec:
+        * TODO: 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);
+       
+       
+       gtk_widget_show (GTK_WIDGET (box));
+       
+       return GTK_WIDGET (box);
+}
+
+/** Change the caption title for the incoming server, 
+ * as specified in the UI spec:
+ */
+static void update_incoming_server_title (ModestAccountSettingsDialog *self)
+{
+       ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
+       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);
+       g_object_set (G_OBJECT (self->caption_incoming), "label", incomingserver_title, NULL);
+       g_free(incomingserver_title);
+}
+
+/** Change the caption title for the incoming server, 
+ * as specified in the UI spec:
+ */
+static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self)
+{
+       ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
+       
+       /* 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. */
+       easysetup_serversecurity_combo_box_fill (
+               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
+}
+
+static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       update_incoming_server_title (self);
+       update_incoming_server_security_choices (self);
+}
+           
+static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, 2);
+       
+       /* Create a size group to be used by all captions.
+        * Note that HildonCaption does not create a default size group if we do not specify one.
+        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
+       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+        
+       /* The incoming server widgets: */
+       if (!self->combo_incoming_servertype)
+               self->combo_incoming_servertype = GTK_WIDGET (easysetup_servertype_combo_box_new ());
+       easysetup_servertype_combo_box_set_active_servertype (
+               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype), MODEST_PROTOCOL_STORE_POP);
+       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
+               _("mcen_li_emailsetup_type"), self->combo_incoming_servertype, NULL, HILDON_CAPTION_MANDATORY);
+       gtk_widget_show (self->combo_incoming_servertype);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       if(!self->entry_incomingserver)
+               self->entry_incomingserver = gtk_entry_new ();
+       set_default_custom_servernames (self);
+
+       if (self->caption_incoming)
+         gtk_widget_destroy (self->caption_incoming);
+          
+       /* The caption 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_caption_new_with_asterix (self, sizegroup, 
+               "Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
+       update_incoming_server_title (self);
+       gtk_widget_show (self->entry_incomingserver);
+       gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2);
+       gtk_widget_show (self->caption_incoming);
+       
+       /* Change the caption title when the servertype changes, 
+        * as in the UI spec: */
+        g_signal_connect (G_OBJECT (self->combo_incoming_servertype), "changed",
+               G_CALLBACK (on_combo_servertype_changed), self);
+       
+       /* The secure connection widgets: */    
+       if (!self->combo_incoming_security)
+               self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
+       update_incoming_server_security_choices (self);
+       easysetup_serversecurity_combo_box_set_active_serversecurity (
+               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), MODEST_PROTOCOL_SECURITY_NONE);
+       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 
+               self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->combo_incoming_security);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       if(!self->checkbox_incoming_auth)
+               self->checkbox_incoming_auth = 
+                       gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
+       gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, 2);
+       gtk_widget_show (self->checkbox_incoming_auth);
+       
+       gtk_widget_show (GTK_WIDGET (box));
+       
+       return GTK_WIDGET (box);
+}
+
+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_smtp_servers_window_hide (GtkWindow *window, gpointer user_data)
+{
+       /* Destroy the window when it is closed: */
+       gtk_widget_destroy (GTK_WIDGET (window));
+}
+
+static void
+on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
+{
+
+       ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       
+       /* Show the window: */
+       /* TODO: Retrieve the chosen settings,
+        * so we can supply them when creating the connection somehow.
+        */
+       GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
+       gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
+       g_signal_connect (G_OBJECT (window), "hide",
+               G_CALLBACK (on_smtp_servers_window_hide), self);
+    gtk_widget_show (window);
+}
+
+static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
+{
+       GtkWidget *box = gtk_vbox_new (FALSE, 2);
+       
+       /* Create a size group to be used by all captions.
+        * Note that HildonCaption does not create a default size group if we do not specify one.
+        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
+       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 *caption = create_caption_new_with_asterix (self, sizegroup, 
+               _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->entry_outgoingserver);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       set_default_custom_servernames (self);
+       
+       /* The secure connection widgets: */    
+       if (!self->combo_outgoing_security)
+               self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
+       easysetup_serversecurity_combo_box_fill (
+               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
+       easysetup_serversecurity_combo_box_set_active_serversecurity (
+               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
+       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 
+               self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->combo_outgoing_security);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* The secure authentication widgets: */
+       if (!self->combo_outgoing_auth)
+               self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
+       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
+               self->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->combo_outgoing_auth);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* connection-specific checkbox: */
+       if (!self->checkbox_outgoing_smtp_specific) {
+               self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp"));
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), 
+                       FALSE);
+       }
+       gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
+       gtk_widget_show (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_emailsetup_edit"));
+       caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
+               self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
+       gtk_widget_show (self->button_outgoing_smtp_servers);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+       gtk_widget_show (caption);
+       
+       /* 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));
+       
+       return GTK_WIDGET (box);
+}
+
+/*
+ */
+static void 
+on_response (GtkDialog *wizard_dialog,
+       gint response_id,
+       gpointer user_data)
+{
+       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
+       enable_buttons (self);
+}
+
+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: */
+       GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new());
+
+    
+    gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup"));
+       
+       /* 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);
+       
+    /* 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 (notebook, self->page_account_details, 
+               gtk_label_new (_("mcen_ti_account_settings_account")));
+       gtk_notebook_append_page (notebook, self->page_user_details, 
+               gtk_label_new (_("mcen_ti_account_settings_userinfo")));
+       gtk_notebook_append_page (notebook, self->page_incoming,
+               gtk_label_new (_("mcen_ti_advsetup_retrieval")));
+       gtk_notebook_append_page (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 (notebook));
+       gtk_widget_show (GTK_WIDGET (notebook));
+        
+    /* Connect to the dialog's response signal: */
+    g_signal_connect_after (G_OBJECT (self), "response",
+            G_CALLBACK (on_response), self);       
+}
+
+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_name (ModestAccountSettingsDialog *dialog, const gchar* account_name)
+{
+       
+       
+}
+
+static gchar*
+util_get_default_servername_from_email_address (const gchar* email_address, ModestProtocol servertype)
+{
+       if (!email_address)
+               return NULL;
+       
+       gchar* at = g_utf8_strchr (email_address, -1, '@');
+       if (!at || (g_utf8_strlen (at, -1) < 2))
+               return NULL;
+               
+       gchar* domain = g_utf8_next_char (at);
+       if(!domain)
+               return NULL;
+               
+       const gchar* hostname = NULL;
+       if (servertype == MODEST_PROTOCOL_STORE_POP)
+               hostname = "pop";
+       else if (servertype == MODEST_PROTOCOL_STORE_IMAP)
+               hostname = "imap";
+       else if (servertype == MODEST_PROTOCOL_TRANSPORT_SMTP)
+               hostname = "smtp";
+       
+       if (!hostname)
+               return NULL;
+               
+       return g_strdup_printf ("%s.%s", hostname, domain);
+}
+
+/* Add a number to the end of the text, or increment a number that is already there.
+ */
+static gchar*
+util_increment_name (const gchar* text)
+{
+       /* Get the end character,
+        * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
+        */
+       const gchar* end = NULL;
+       if (!g_utf8_validate (text, -1, &end))
+               return NULL;
+  
+       if (!end)
+               return NULL;
+               
+       --end; /* Go to before the null-termination. */
+               
+       /* Look at each UTF-8 characer, starting at the end: */
+       const gchar* p = end;
+       const gchar* alpha_end = NULL;
+       while (p)
+       {       
+               /* Stop when we reach the first character that is not a numeric digit: */
+               const gunichar ch = g_utf8_get_char (p);
+               if (!g_unichar_isdigit (ch)) {
+                       alpha_end = p;
+                       break;
+               }
+               
+               p = g_utf8_prev_char (p);       
+       }
+       
+       if(!alpha_end) {
+               /* The text must consist completely of numeric digits. */
+               alpha_end = text;
+       }
+       else
+               ++alpha_end;
+       
+       /* Intepret and increment the number, if any: */
+       gint num = atol (alpha_end);
+       ++num;
+       
+       /* Get the name part: */
+       gint name_len = alpha_end - text;
+       gchar *name_without_number = g_malloc(name_len + 1);
+       memcpy (name_without_number, text, name_len);
+       name_without_number[name_len] = 0;\
+       
+    /* Concatenate the text part and the new number: */        
+       gchar *result = g_strdup_printf("%s%d", name_without_number, num);
+       g_free (name_without_number);
+       
+       return result;  
+}
+       
+static void set_default_custom_servernames (ModestAccountSettingsDialog *account_wizard)
+{
+       if (!account_wizard->entry_incomingserver)
+               return;
+               
+       /* Set a default domain for the server, based on the email address,
+        * if no server name was already specified.
+        */
+       const gchar* incoming_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_incomingserver));
+       if ((!incoming_existing || (strlen(incoming_existing) == 0)) 
+               && account_wizard->entry_user_email) {
+               const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
+                       EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype));
+               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
+               
+               gchar* servername = util_get_default_servername_from_email_address (email_address, protocol);
+               gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_incomingserver), servername);
+               g_free (servername);
+       }
+       
+       /* Set a default domain for the server, based on the email address,
+        * if no server name was already specified.
+        */
+       const gchar* outgoing_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_outgoingserver));
+       if ((!outgoing_existing || (strlen(outgoing_existing) == 0)) 
+               && account_wizard->entry_user_email) {
+               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
+               
+               gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOL_TRANSPORT_SMTP);
+               gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_outgoingserver), servername);
+               g_free (servername);
+       }
+}
+
+#if 0
+static gboolean
+on_before_next (GtkDialog *dialog, GtkWidget *current_page, GtkWidget *next_page)
+{
+       ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
+       
+       /* Do extra validation that couldn't be done for every key press,
+        * either because it was too slow,
+        * or because it requires interaction:
+        */
+       if (current_page == account_wizard->page_account_details) {     
+               /* Check that the title is not already in use: */
+               const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_account_title));
+               if ((!account_name) || (strlen(account_name) == 0))
+                       return FALSE;
+                       
+               gboolean name_in_use = FALSE;
+               name_in_use = modest_account_mgr_account_exists (account_wizard->account_manager,
+                       account_name, FALSE /*  server_account */);
+               
+               if (name_in_use) {
+                       /* Warn the user via a dialog: */
+                       show_error (GTK_WINDOW (account_wizard), _("mail_ib_account_name_already_existing."));
+            
+                       return FALSE;
+               }
+       }
+       else if (current_page == account_wizard->page_user_details) {
+               /* Check that the email address is valud: */
+               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_user_email));
+               if ((!email_address) || (strlen(email_address) == 0))
+                       return FALSE;
+                       
+               if (!modest_text_utils_validate_email_address (email_address)) {
+                       /* Warn the user via a dialog: */
+                       show_error (GTK_WINDOW (account_wizard), _("mcen_ib_invalid_email"));
+                                             
+            /* Return focus to the email address entry: */
+            gtk_widget_grab_focus (account_wizard->entry_user_email);
+            
+                       return FALSE;
+               }
+               
+               /* Make sure that the subsequent pages are appropriate for the provider choice. */
+               create_subsequent_pages (account_wizard);
+       }
+       
+       /* TODO: The UI Spec wants us to check that the servernames are valid, 
+        * but does not specify how.
+        */
+         
+       if(next_page == account_wizard->page_incoming) {
+               set_default_custom_servernames (account_wizard);
+       }
+       else if (next_page == account_wizard->page_outgoing) {
+               set_default_custom_servernames (account_wizard);
+       }
+       
+       /* If this is the last page, and this is a click on Finish, 
+        * then attempt to create the dialog.
+        */
+       if(!next_page) /* This is NULL when this is a click on Finish. */
+       {
+               create_account (account_wizard);
+       }
+       
+       
+       return TRUE;
+}
+#endif
+
+#if 0
+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
+               return FALSE;
+}
+#endif
+
+#if 0
+static void
+on_enable_buttons (GtkDialog *dialog, GtkWidget *current_page)
+{
+       ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
+       
+       gboolean enable_next = TRUE;
+       if (current_page == account_wizard->page_welcome) {
+               enable_next = TRUE;
+       }
+       else if (current_page == account_wizard->page_account_details) {
+               /* The account details title is mandatory: */
+               if (entry_is_empty(account_wizard->entry_account_title))
+                       enable_next = FALSE;
+       }
+       else if (current_page == account_wizard->page_user_details) {   
+               /* The user details username is mandatory: */
+               if (entry_is_empty(account_wizard->entry_user_username))
+                       enable_next = FALSE;
+                       
+               /* The user details email address is mandatory: */
+               if (enable_next && entry_is_empty (account_wizard->entry_user_email))
+                       enable_next = FALSE;
+       }
+       else if (current_page == account_wizard->page_incoming) {
+               /* The custom incoming server is mandatory: */
+               if (entry_is_empty(account_wizard->entry_incomingserver))
+                       enable_next = FALSE;
+       }
+                       
+       /* Enable the buttons, 
+        * identifying them via their associated response codes:
+        */
+       GtkDialog *dialog_base = GTK_DIALOG (dialog);
+    gtk_dialog_set_response_sensitive (dialog_base,
+                                       MODEST_WIZARD_DIALOG_NEXT,
+                                       enable_next);
+                                       
+    /* Disable the Finish button until we are on the last page,
+     * because HildonWizardDialog enables this for all but the first page: */
+    GtkNotebook *notebook = NULL;
+       g_object_get (dialog_base, "wizard-notebook", &notebook, NULL);
+       
+    gint current = gtk_notebook_get_current_page (notebook);
+    gint last = gtk_notebook_get_n_pages (notebook) - 1;
+    gboolean is_last = (current == last);
+    
+    if(!is_last) {
+       gtk_dialog_set_response_sensitive (dialog_base,
+                                       MODEST_WIZARD_DIALOG_FINISH,
+                                       FALSE);
+    }
+}
+#endif
+
+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;
+}
+#if 0
+static void
+show_error (GtkWindow *parent_window, const gchar* text)
+{
+       GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
+               (GtkDialogFlags)0,
+                GTK_MESSAGE_ERROR,
+                GTK_BUTTONS_OK,
+                text ));
+                
+                gtk_dialog_run (dialog);
+                gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+#endif
+
+#if 0
+/** Attempt to create the account from the information that the user has entered.
+ * @result: TRUE if the account was successfully created.
+ */
+gboolean
+create_account (ModestAccountSettingsDialog *self)
+{
+       ModestAccountSettingsDialogPrivate *priv = ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
+       
+       const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
+
+       /* Some checks: */
+       if (!account_name)
+               return FALSE;
+               
+       /* We should have checked for this already, 
+        * and changed that name accordingly, 
+        * but let's check again just in case:
+        */
+       if (modest_account_mgr_account_exists (self->account_manager, account_name, FALSE)) 
+               return FALSE;   
+               
+       /* username and password (for both incoming and outgoing): */
+       const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username));
+       const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password));
+       
+       /* Incoming server: */
+       /* Note: We need something as default for the ModestProtocol values, 
+        * or modest_account_mgr_add_server_account will fail. */
+       gchar* servername_incoming = NULL;
+       ModestProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
+       ModestProtocol protocol_security_incoming = MODEST_PROTOCOL_SECURITY_NONE;
+       ModestProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE;
+       
+       
+       /* Use custom pages because no preset was specified: */
+       servername_incoming = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver) ));
+       
+       protocol_incoming = easysetup_servertype_combo_box_get_active_servertype (
+       EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
+       
+       protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
+       EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
+       
+       protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) 
+               ? MODEST_PROTOCOL_AUTH_PASSWORD
+               : MODEST_PROTOCOL_AUTH_NONE;
+               
+
+       
+       /* First we add the 2 server accounts, and then we add the account that uses them.
+        * If we don't do it in this order then we will experience a crash. */
+        
+       /* Add a (incoming) server account, to be used by the account: */
+       gchar *store_name = g_strconcat (account_name, "_store", NULL);
+       gboolean created = modest_account_mgr_add_server_account (self->account_manager,
+               store_name,
+               servername_incoming,
+               username, password,
+               protocol_incoming,
+               protocol_security_incoming,
+               protocol_authentication_incoming);              
+               
+       g_free (servername_incoming);
+       
+       if (!created) {
+               /* TODO: Provide a Logical ID for the text: */
+               show_error (GTK_WINDOW (self), _("An error occurred while creating the incoming account."));
+               return FALSE;   
+       }
+       
+       /* Sanity check: */
+       /* There must be at least one account now: */
+       GSList *account_names = modest_account_mgr_account_names (self->account_manager);
+       if(account_names != NULL)
+       {
+               g_warning ("modest_account_mgr_account_names() returned NULL after adding an account.");
+       }
+       g_slist_free (account_names);
+       
+       
+       /* Outgoing server: */
+       gchar* servername_outgoing = NULL;
+       ModestProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
+       ModestProtocol protocol_security_outgoing = MODEST_PROTOCOL_SECURITY_NONE;
+       ModestProtocol protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
+       
+       
+       /* Use custom pages because no preset was specified: */
+       servername_outgoing = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver) ));
+       
+       protocol_outgoing = MODEST_PROTOCOL_TRANSPORT_SMTP; /* It's always SMTP for outgoing. */
+
+       protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
+               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
+       
+       protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
+               EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
+       
+       /* TODO: 
+       gboolean specific = gtk_toggle_button_get_active (
+               GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific));
+       */
+               
+           
+       /* Add a (outgoing) server account to be used by the account: */
+       gchar *transport_name = g_strconcat (account_name, "_transport", NULL); /* What is this good for? */
+       created = modest_account_mgr_add_server_account (self->account_manager,
+               transport_name,
+               servername_outgoing,
+               username, password,
+               protocol_outgoing,
+               protocol_security_outgoing,
+               protocol_authentication_outgoing);
+               
+       g_free (servername_outgoing);
+               
+       if (!created) {
+               /* TODO: Provide a Logical ID for the text: */
+               show_error (GTK_WINDOW (self), _("An error occurred while creating the outgoing account."));
+               return FALSE;   
+       }
+       
+       
+       /* Create the account, which will contain the two "server accounts": */
+       created = modest_account_mgr_add_account (self->account_manager, account_name, 
+               store_name, /* The name of our POP/IMAP server account. */
+               transport_name /* The name of our SMTP server account. */);
+       g_free (store_name);
+       g_free (transport_name);
+       
+       if (!created) {
+               /* TODO: Provide a Logical ID for the text: */
+               show_error (GTK_WINDOW (self), _("An error occurred while creating the account."));
+               return FALSE;   
+       }
+       
+       return FALSE;
+}
+#endif
+
+
diff --git a/src/maemo/modest-account-settings-dialog.h b/src/maemo/modest-account-settings-dialog.h
new file mode 100644 (file)
index 0000000..9eee50b
--- /dev/null
@@ -0,0 +1,86 @@
+/* Copyright (c) 2007, Nokia Corporation
+ * All rights reserved.
+ *
+ */
+
+#ifndef _MODEST_ACCOUNT_SETTINGS_DIALOG
+#define _MODEST_ACCOUNT_SETTINGS_DIALOG
+
+#include <gtk/gtkdialog.h> 
+#include "modest-account-mgr.h"
+#include <hildon-widgets/hildon-caption.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;
+       
+       GtkWidget *page_account_details;
+       GtkWidget *combo_account_country;
+       GtkWidget *combo_account_serviceprovider;
+       GtkWidget *entry_account_title;
+       
+       GtkWidget *page_user_details;
+       GtkWidget *entry_user_name;
+       GtkWidget *entry_user_username;
+       GtkWidget *entry_user_password;
+       GtkWidget *entry_user_email;
+       
+       GtkWidget *page_complete_easysetup;
+       
+       GtkWidget *page_incoming;
+       GtkWidget *combo_incoming_servertype;
+       GtkWidget *caption_incoming;
+       GtkWidget *entry_incomingserver;
+       GtkWidget *combo_incoming_security;
+       GtkWidget *checkbox_incoming_auth;
+
+       GtkWidget *page_outgoing;
+       GtkWidget *entry_outgoingserver;
+       GtkWidget *combo_outgoing_security;
+       GtkWidget *combo_outgoing_auth;
+       GtkWidget *checkbox_outgoing_smtp_specific;
+       GtkWidget *button_outgoing_smtp_servers;
+       
+} 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_name (ModestAccountSettingsDialog *dialog, const gchar* account_name);
+
+G_END_DECLS
+
+#endif /* _MODEST_ACCOUNT_SETTINGS_DIALOG */
diff --git a/src/maemo/modest-account-settings-window.c b/src/maemo/modest-account-settings-window.c
deleted file mode 100644 (file)
index cc6eedd..0000000
+++ /dev/null
@@ -1,1023 +0,0 @@
-/* Copyright (c) 2007, Nokia Corporation
- * All rights reserved.
- *
- */
-
-
-#include "modest-account-settings-window.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 <hildon-widgets/hildon-caption.h>
-#include "maemo/easysetup/modest-easysetup-country-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-serversecurity-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-secureauth-combo-box.h"
-#include "maemo/easysetup/modest-validating-entry.h"
-#include "modest-text-utils.h"
-#include "modest-account-mgr.h"
-#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
-#include "maemo/modest-connection-specific-smtp-window.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 EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
-
-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
-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_manager)
-               g_object_unref (G_OBJECT (self->account_manager));
-       
-       G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
-}
-
-#if 0
-static void
-show_error (GtkWindow *parent_window, const gchar* text);
-#endif
-
-static void
-set_default_custom_servernames(ModestAccountSettingsDialog *dialog);
-
-static gchar*
-util_increment_name (const gchar* text);
-
-static void
-enable_buttons (ModestAccountSettingsDialog *self)
-{
-}
-
-static void
-on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       g_assert(self);
-       enable_buttons(self);
-}
-
-static void
-on_caption_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 caption containing a mandatory widget.
- * When the widget is edited, the enable_buttons() vfunc will be called.
- */
-static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *self,
-       GtkSizeGroup *group,
-       const gchar *value,
-       GtkWidget *control,
-       GtkWidget *icon,
-       HildonCaptionStatus flag)
-{
-  GtkWidget *caption = hildon_caption_new (group, value, control, icon, flag);
-  
-/* The translated strings seem to already contain the *,
- * but this code can be used if that is not true in future.
- */
-#if 0
-       /* Add a * character to indicate mandatory fields,
-        * as specified in our "Email UI Specification": */
-       if (flag == HILDON_CAPTION_MANDATORY) {
-               gchar* title = g_strdup_printf("%s*", value);
-               caption = hildon_caption_new (group, title, control, icon, flag);       
-               g_free(title);
-       }       
-       else
-               caption = hildon_caption_new (group, value, control, icon, flag);
-#endif
-
-       /* 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_caption_entry_changed), self);
-               
-       }
-       else if (GTK_IS_COMBO_BOX (control)) {
-               g_signal_connect (G_OBJECT (control), "changed",
-               G_CALLBACK (on_caption_combobox_changed), self);
-       }
-        
-       return caption;
-}
-
-static GtkWidget*
-create_page_account_details (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, 2);
-       GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
-       gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 2);
-       gtk_widget_show (label);
-       
-       /* Create a size group to be used by all captions.
-        * Note that HildonCaption does not create a default size group if we do not specify one.
-        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
-       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-           
-               
-       /* The description widgets: */  
-       self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ());
-       
-       /* Set a default account title, choosing one that does not already exist: */
-       gchar* default_acount_name = g_strdup (_("mcen_ia_emailsetup_defaultname"));
-       while (modest_account_mgr_account_exists (self->account_manager, 
-               default_acount_name, FALSE /*  server_account */)) {
-                       
-               gchar * default_account_name2 = util_increment_name (default_acount_name);
-               g_free (default_acount_name);
-               default_acount_name = default_account_name2;
-       }
-       
-       gtk_entry_set_text( GTK_ENTRY (self->entry_account_title), default_acount_name);
-       g_free (default_acount_name);
-       default_acount_name = NULL;
-
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"), 
-               self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
-       gtk_widget_show (self->entry_account_title);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* 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, "\""); /* The UI spec mentions “, but maybe means ", maybe both. */
-       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, "^");       
-       easysetup_validating_entry_set_unallowed_characters (
-               EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
-       g_list_free (list_prevent);
-       
-       /* Set max length as in the UI spec:
-        * TODO: 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);
-       
-       gtk_widget_show (GTK_WIDGET (box));
-       
-       return GTK_WIDGET (box);
-}
-
-static GtkWidget*
-create_page_user_details (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, 2);
-       
-       /* Create a size group to be used by all captions.
-        * Note that HildonCaption does not create a default size group if we do not specify one.
-        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
-       GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
-       /* The name widgets: */
-       self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ());
-       /* Set max length as in the UI spec:
-        * TODO: 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);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
-               _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->entry_user_name);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* 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, ">");
-       easysetup_validating_entry_set_unallowed_characters (
-               EASYSETUP_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
-       g_list_free (list_prevent);
-       
-       /* The username widgets: */     
-       self->entry_user_username = GTK_WIDGET (easysetup_validating_entry_new ());
-       caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
-               self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
-       gtk_widget_show (self->entry_user_username);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* Prevent the use of some characters in the username, 
-        * as required by our UI specification: */
-       easysetup_validating_entry_set_unallowed_characters_whitespace (
-               EASYSETUP_VALIDATING_ENTRY (self->entry_user_username));
-       
-       /* Set max length as in the UI spec:
-        * TODO: 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);
-       
-       /* 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), '*'); */
-       caption = create_caption_new_with_asterix (self, sizegroup, 
-               _("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->entry_user_password);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* The email address widgets: */        
-       self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ());
-       caption = create_caption_new_with_asterix (self, sizegroup, 
-               _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
-       gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
-       gtk_widget_show (self->entry_user_email);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* Set max length as in the UI spec:
-        * TODO: 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);
-       
-       
-       gtk_widget_show (GTK_WIDGET (box));
-       
-       return GTK_WIDGET (box);
-}
-
-/** Change the caption title for the incoming server, 
- * as specified in the UI spec:
- */
-static void update_incoming_server_title (ModestAccountSettingsDialog *self)
-{
-       ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
-               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
-       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);
-       g_object_set (G_OBJECT (self->caption_incoming), "label", incomingserver_title, NULL);
-       g_free(incomingserver_title);
-}
-
-/** Change the caption title for the incoming server, 
- * as specified in the UI spec:
- */
-static void update_incoming_server_security_choices (ModestAccountSettingsDialog *self)
-{
-       ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
-               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
-       
-       /* 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. */
-       easysetup_serversecurity_combo_box_fill (
-               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
-}
-
-void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       update_incoming_server_title (self);
-       update_incoming_server_security_choices (self);
-}
-           
-static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, 2);
-       
-       /* Create a size group to be used by all captions.
-        * Note that HildonCaption does not create a default size group if we do not specify one.
-        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
-       GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
-       /* The incoming server widgets: */
-       if (!self->combo_incoming_servertype)
-               self->combo_incoming_servertype = GTK_WIDGET (easysetup_servertype_combo_box_new ());
-       easysetup_servertype_combo_box_set_active_servertype (
-               EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype), MODEST_PROTOCOL_STORE_POP);
-       GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
-               _("mcen_li_emailsetup_type"), self->combo_incoming_servertype, NULL, HILDON_CAPTION_MANDATORY);
-       gtk_widget_show (self->combo_incoming_servertype);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       if(!self->entry_incomingserver)
-               self->entry_incomingserver = gtk_entry_new ();
-       set_default_custom_servernames (self);
-
-       if (self->caption_incoming)
-         gtk_widget_destroy (self->caption_incoming);
-          
-       /* The caption 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_caption_new_with_asterix (self, sizegroup, 
-               "Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
-       update_incoming_server_title (self);
-       gtk_widget_show (self->entry_incomingserver);
-       gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2);
-       gtk_widget_show (self->caption_incoming);
-       
-       /* Change the caption title when the servertype changes, 
-        * as in the UI spec: */
-        g_signal_connect (G_OBJECT (self->combo_incoming_servertype), "changed",
-               G_CALLBACK (on_combo_servertype_changed), self);
-       
-       /* The secure connection widgets: */    
-       if (!self->combo_incoming_security)
-               self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
-       update_incoming_server_security_choices (self);
-       easysetup_serversecurity_combo_box_set_active_serversecurity (
-               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), MODEST_PROTOCOL_SECURITY_NONE);
-       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 
-               self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->combo_incoming_security);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       if(!self->checkbox_incoming_auth)
-               self->checkbox_incoming_auth = 
-                       gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, 2);
-       gtk_widget_show (self->checkbox_incoming_auth);
-       
-       gtk_widget_show (GTK_WIDGET (box));
-       
-       return GTK_WIDGET (box);
-}
-
-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_smtp_servers_window_hide (GtkWindow *window, gpointer user_data)
-{
-       /* Destroy the window when it is closed: */
-       gtk_widget_destroy (GTK_WIDGET (window));
-}
-
-static void
-on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
-{
-
-       ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
-       
-       /* Show the window: */
-       /* TODO: Retrieve the chosen settings,
-        * so we can supply them when creating the connection somehow.
-        */
-       GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
-       gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
-       g_signal_connect (G_OBJECT (window), "hide",
-               G_CALLBACK (on_smtp_servers_window_hide), self);
-    gtk_widget_show (window);
-}
-
-static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
-{
-       GtkWidget *box = gtk_vbox_new (FALSE, 2);
-       
-       /* Create a size group to be used by all captions.
-        * Note that HildonCaption does not create a default size group if we do not specify one.
-        * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
-       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 *caption = create_caption_new_with_asterix (self, sizegroup, 
-               _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->entry_outgoingserver);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       set_default_custom_servernames (self);
-       
-       /* The secure connection widgets: */    
-       if (!self->combo_outgoing_security)
-               self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
-       easysetup_serversecurity_combo_box_fill (
-               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
-       easysetup_serversecurity_combo_box_set_active_serversecurity (
-               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
-       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 
-               self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->combo_outgoing_security);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* The secure authentication widgets: */
-       if (!self->combo_outgoing_auth)
-               self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
-       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
-               self->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->combo_outgoing_auth);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* connection-specific checkbox: */
-       if (!self->checkbox_outgoing_smtp_specific) {
-               self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp"));
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), 
-                       FALSE);
-       }
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
-       gtk_widget_show (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_emailsetup_edit"));
-       caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
-               self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
-       gtk_widget_show (self->button_outgoing_smtp_servers);
-       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
-       gtk_widget_show (caption);
-       
-       /* 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));
-       
-       return GTK_WIDGET (box);
-}
-
-/*
- */
-static void 
-on_response (GtkDialog *wizard_dialog,
-       gint response_id,
-       gpointer user_data)
-{
-       ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog);
-       enable_buttons (self);
-}
-
-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: */
-       GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new());
-
-    
-    gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_emailsetup"));
-       
-       /* 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);
-       
-    /* 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 (notebook, self->page_account_details, 
-               gtk_label_new (_("mcen_ti_account_settings_account")));
-       gtk_notebook_append_page (notebook, self->page_user_details, 
-               gtk_label_new (_("mcen_ti_account_settings_userinfo")));
-       gtk_notebook_append_page (notebook, self->page_incoming,
-               gtk_label_new (_("mcen_ti_advsetup_retrieval")));
-       gtk_notebook_append_page (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 (notebook));
-       gtk_widget_show (GTK_WIDGET (notebook));
-        
-    /* Connect to the dialog's response signal: */
-    g_signal_connect_after (G_OBJECT (self), "response",
-            G_CALLBACK (on_response), self);       
-}
-
-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_name (const gchar* account_name)
-{
-       
-       
-}
-
-gchar*
-util_get_default_servername_from_email_address (const gchar* email_address, ModestProtocol servertype)
-{
-       if (!email_address)
-               return NULL;
-       
-       gchar* at = g_utf8_strchr (email_address, -1, '@');
-       if (!at || (g_utf8_strlen (at, -1) < 2))
-               return NULL;
-               
-       gchar* domain = g_utf8_next_char (at);
-       if(!domain)
-               return NULL;
-               
-       const gchar* hostname = NULL;
-       if (servertype == MODEST_PROTOCOL_STORE_POP)
-               hostname = "pop";
-       else if (servertype == MODEST_PROTOCOL_STORE_IMAP)
-               hostname = "imap";
-       else if (servertype == MODEST_PROTOCOL_TRANSPORT_SMTP)
-               hostname = "smtp";
-       
-       if (!hostname)
-               return NULL;
-               
-       return g_strdup_printf ("%s.%s", hostname, domain);
-}
-
-/* Add a number to the end of the text, or increment a number that is already there.
- */
-static gchar*
-util_increment_name (const gchar* text)
-{
-       /* Get the end character,
-        * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
-        */
-       const gchar* end = NULL;
-       if (!g_utf8_validate (text, -1, &end))
-               return NULL;
-  
-       if (!end)
-               return NULL;
-               
-       --end; /* Go to before the null-termination. */
-               
-       /* Look at each UTF-8 characer, starting at the end: */
-       const gchar* p = end;
-       const gchar* alpha_end = NULL;
-       while (p)
-       {       
-               /* Stop when we reach the first character that is not a numeric digit: */
-               const gunichar ch = g_utf8_get_char (p);
-               if (!g_unichar_isdigit (ch)) {
-                       alpha_end = p;
-                       break;
-               }
-               
-               p = g_utf8_prev_char (p);       
-       }
-       
-       if(!alpha_end) {
-               /* The text must consist completely of numeric digits. */
-               alpha_end = text;
-       }
-       else
-               ++alpha_end;
-       
-       /* Intepret and increment the number, if any: */
-       gint num = atol (alpha_end);
-       ++num;
-       
-       /* Get the name part: */
-       gint name_len = alpha_end - text;
-       gchar *name_without_number = g_malloc(name_len + 1);
-       memcpy (name_without_number, text, name_len);
-       name_without_number[name_len] = 0;\
-       
-    /* Concatenate the text part and the new number: */        
-       gchar *result = g_strdup_printf("%s%d", name_without_number, num);
-       g_free (name_without_number);
-       
-       return result;  
-}
-       
-static void set_default_custom_servernames (ModestAccountSettingsDialog *account_wizard)
-{
-       if (!account_wizard->entry_incomingserver)
-               return;
-               
-       /* Set a default domain for the server, based on the email address,
-        * if no server name was already specified.
-        */
-       const gchar* incoming_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_incomingserver));
-       if ((!incoming_existing || (strlen(incoming_existing) == 0)) 
-               && account_wizard->entry_user_email) {
-               const ModestProtocol protocol = easysetup_servertype_combo_box_get_active_servertype (
-                       EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype));
-               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
-               
-               gchar* servername = util_get_default_servername_from_email_address (email_address, protocol);
-               gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_incomingserver), servername);
-               g_free (servername);
-       }
-       
-       /* Set a default domain for the server, based on the email address,
-        * if no server name was already specified.
-        */
-       const gchar* outgoing_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_outgoingserver));
-       if ((!outgoing_existing || (strlen(outgoing_existing) == 0)) 
-               && account_wizard->entry_user_email) {
-               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email));
-               
-               gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOL_TRANSPORT_SMTP);
-               gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_outgoingserver), servername);
-               g_free (servername);
-       }
-}
-
-#if 0
-static gboolean
-on_before_next (GtkDialog *dialog, GtkWidget *current_page, GtkWidget *next_page)
-{
-       ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
-       
-       /* Do extra validation that couldn't be done for every key press,
-        * either because it was too slow,
-        * or because it requires interaction:
-        */
-       if (current_page == account_wizard->page_account_details) {     
-               /* Check that the title is not already in use: */
-               const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_account_title));
-               if ((!account_name) || (strlen(account_name) == 0))
-                       return FALSE;
-                       
-               gboolean name_in_use = FALSE;
-               name_in_use = modest_account_mgr_account_exists (account_wizard->account_manager,
-                       account_name, FALSE /*  server_account */);
-               
-               if (name_in_use) {
-                       /* Warn the user via a dialog: */
-                       show_error (GTK_WINDOW (account_wizard), _("mail_ib_account_name_already_existing."));
-            
-                       return FALSE;
-               }
-       }
-       else if (current_page == account_wizard->page_user_details) {
-               /* Check that the email address is valud: */
-               const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_user_email));
-               if ((!email_address) || (strlen(email_address) == 0))
-                       return FALSE;
-                       
-               if (!modest_text_utils_validate_email_address (email_address)) {
-                       /* Warn the user via a dialog: */
-                       show_error (GTK_WINDOW (account_wizard), _("mcen_ib_invalid_email"));
-                                             
-            /* Return focus to the email address entry: */
-            gtk_widget_grab_focus (account_wizard->entry_user_email);
-            
-                       return FALSE;
-               }
-               
-               /* Make sure that the subsequent pages are appropriate for the provider choice. */
-               create_subsequent_pages (account_wizard);
-       }
-       
-       /* TODO: The UI Spec wants us to check that the servernames are valid, 
-        * but does not specify how.
-        */
-         
-       if(next_page == account_wizard->page_incoming) {
-               set_default_custom_servernames (account_wizard);
-       }
-       else if (next_page == account_wizard->page_outgoing) {
-               set_default_custom_servernames (account_wizard);
-       }
-       
-       /* If this is the last page, and this is a click on Finish, 
-        * then attempt to create the dialog.
-        */
-       if(!next_page) /* This is NULL when this is a click on Finish. */
-       {
-               create_account (account_wizard);
-       }
-       
-       
-       return TRUE;
-}
-#endif
-
-#if 0
-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
-               return FALSE;
-}
-#endif
-
-#if 0
-static void
-on_enable_buttons (GtkDialog *dialog, GtkWidget *current_page)
-{
-       ModestAccountSettingsDialog *account_wizard = MODEST_ACCOUNT_SETTINGS_DIALOG (dialog);
-       
-       gboolean enable_next = TRUE;
-       if (current_page == account_wizard->page_welcome) {
-               enable_next = TRUE;
-       }
-       else if (current_page == account_wizard->page_account_details) {
-               /* The account details title is mandatory: */
-               if (entry_is_empty(account_wizard->entry_account_title))
-                       enable_next = FALSE;
-       }
-       else if (current_page == account_wizard->page_user_details) {   
-               /* The user details username is mandatory: */
-               if (entry_is_empty(account_wizard->entry_user_username))
-                       enable_next = FALSE;
-                       
-               /* The user details email address is mandatory: */
-               if (enable_next && entry_is_empty (account_wizard->entry_user_email))
-                       enable_next = FALSE;
-       }
-       else if (current_page == account_wizard->page_incoming) {
-               /* The custom incoming server is mandatory: */
-               if (entry_is_empty(account_wizard->entry_incomingserver))
-                       enable_next = FALSE;
-       }
-                       
-       /* Enable the buttons, 
-        * identifying them via their associated response codes:
-        */
-       GtkDialog *dialog_base = GTK_DIALOG (dialog);
-    gtk_dialog_set_response_sensitive (dialog_base,
-                                       MODEST_WIZARD_DIALOG_NEXT,
-                                       enable_next);
-                                       
-    /* Disable the Finish button until we are on the last page,
-     * because HildonWizardDialog enables this for all but the first page: */
-    GtkNotebook *notebook = NULL;
-       g_object_get (dialog_base, "wizard-notebook", &notebook, NULL);
-       
-    gint current = gtk_notebook_get_current_page (notebook);
-    gint last = gtk_notebook_get_n_pages (notebook) - 1;
-    gboolean is_last = (current == last);
-    
-    if(!is_last) {
-       gtk_dialog_set_response_sensitive (dialog_base,
-                                       MODEST_WIZARD_DIALOG_FINISH,
-                                       FALSE);
-    }
-}
-#endif
-
-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;
-}
-#if 0
-static void
-show_error (GtkWindow *parent_window, const gchar* text)
-{
-       GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
-               (GtkDialogFlags)0,
-                GTK_MESSAGE_ERROR,
-                GTK_BUTTONS_OK,
-                text ));
-                
-                gtk_dialog_run (dialog);
-                gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-#endif
-
-#if 0
-/** Attempt to create the account from the information that the user has entered.
- * @result: TRUE if the account was successfully created.
- */
-gboolean
-create_account (ModestAccountSettingsDialog *self)
-{
-       ModestAccountSettingsDialogPrivate *priv = ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
-       
-       const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
-
-       /* Some checks: */
-       if (!account_name)
-               return FALSE;
-               
-       /* We should have checked for this already, 
-        * and changed that name accordingly, 
-        * but let's check again just in case:
-        */
-       if (modest_account_mgr_account_exists (self->account_manager, account_name, FALSE)) 
-               return FALSE;   
-               
-       /* username and password (for both incoming and outgoing): */
-       const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username));
-       const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password));
-       
-       /* Incoming server: */
-       /* Note: We need something as default for the ModestProtocol values, 
-        * or modest_account_mgr_add_server_account will fail. */
-       gchar* servername_incoming = NULL;
-       ModestProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP;
-       ModestProtocol protocol_security_incoming = MODEST_PROTOCOL_SECURITY_NONE;
-       ModestProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE;
-       
-       
-       /* Use custom pages because no preset was specified: */
-       servername_incoming = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver) ));
-       
-       protocol_incoming = easysetup_servertype_combo_box_get_active_servertype (
-       EASYSETUP_SERVERTYPE_COMBO_BOX (self->combo_incoming_servertype));
-       
-       protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
-       EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
-       
-       protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) 
-               ? MODEST_PROTOCOL_AUTH_PASSWORD
-               : MODEST_PROTOCOL_AUTH_NONE;
-               
-
-       
-       /* First we add the 2 server accounts, and then we add the account that uses them.
-        * If we don't do it in this order then we will experience a crash. */
-        
-       /* Add a (incoming) server account, to be used by the account: */
-       gchar *store_name = g_strconcat (account_name, "_store", NULL);
-       gboolean created = modest_account_mgr_add_server_account (self->account_manager,
-               store_name,
-               servername_incoming,
-               username, password,
-               protocol_incoming,
-               protocol_security_incoming,
-               protocol_authentication_incoming);              
-               
-       g_free (servername_incoming);
-       
-       if (!created) {
-               /* TODO: Provide a Logical ID for the text: */
-               show_error (GTK_WINDOW (self), _("An error occurred while creating the incoming account."));
-               return FALSE;   
-       }
-       
-       /* Sanity check: */
-       /* There must be at least one account now: */
-       GSList *account_names = modest_account_mgr_account_names (self->account_manager);
-       if(account_names != NULL)
-       {
-               g_warning ("modest_account_mgr_account_names() returned NULL after adding an account.");
-       }
-       g_slist_free (account_names);
-       
-       
-       /* Outgoing server: */
-       gchar* servername_outgoing = NULL;
-       ModestProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP;
-       ModestProtocol protocol_security_outgoing = MODEST_PROTOCOL_SECURITY_NONE;
-       ModestProtocol protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE;
-       
-       
-       /* Use custom pages because no preset was specified: */
-       servername_outgoing = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver) ));
-       
-       protocol_outgoing = MODEST_PROTOCOL_TRANSPORT_SMTP; /* It's always SMTP for outgoing. */
-
-       protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
-               EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
-       
-       protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
-               EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
-       
-       /* TODO: 
-       gboolean specific = gtk_toggle_button_get_active (
-               GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific));
-       */
-               
-           
-       /* Add a (outgoing) server account to be used by the account: */
-       gchar *transport_name = g_strconcat (account_name, "_transport", NULL); /* What is this good for? */
-       created = modest_account_mgr_add_server_account (self->account_manager,
-               transport_name,
-               servername_outgoing,
-               username, password,
-               protocol_outgoing,
-               protocol_security_outgoing,
-               protocol_authentication_outgoing);
-               
-       g_free (servername_outgoing);
-               
-       if (!created) {
-               /* TODO: Provide a Logical ID for the text: */
-               show_error (GTK_WINDOW (self), _("An error occurred while creating the outgoing account."));
-               return FALSE;   
-       }
-       
-       
-       /* Create the account, which will contain the two "server accounts": */
-       created = modest_account_mgr_add_account (self->account_manager, account_name, 
-               store_name, /* The name of our POP/IMAP server account. */
-               transport_name /* The name of our SMTP server account. */);
-       g_free (store_name);
-       g_free (transport_name);
-       
-       if (!created) {
-               /* TODO: Provide a Logical ID for the text: */
-               show_error (GTK_WINDOW (self), _("An error occurred while creating the account."));
-               return FALSE;   
-       }
-       
-       return FALSE;
-}
-#endif
-
-
diff --git a/src/maemo/modest-account-settings-window.h b/src/maemo/modest-account-settings-window.h
deleted file mode 100644 (file)
index 66ce9c0..0000000
+++ /dev/null
@@ -1,86 +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 "modest-account-mgr.h"
-#include <hildon-widgets/hildon-caption.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 ACCOUNT_IS_WIZARD_DIALOG(obj) \
-       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-       MODEST_TYPE_ACCOUNT_SETTINGS_DIALOG))
-
-#define MODEST_EASYSETUP_IS_WIZARD_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;
-       
-       GtkWidget *page_account_details;
-       GtkWidget *combo_account_country;
-       GtkWidget *combo_account_serviceprovider;
-       GtkWidget *entry_account_title;
-       
-       GtkWidget *page_user_details;
-       GtkWidget *entry_user_name;
-       GtkWidget *entry_user_username;
-       GtkWidget *entry_user_password;
-       GtkWidget *entry_user_email;
-       
-       GtkWidget *page_complete_easysetup;
-       
-       GtkWidget *page_incoming;
-       GtkWidget *combo_incoming_servertype;
-       GtkWidget *caption_incoming;
-       GtkWidget *entry_incomingserver;
-       GtkWidget *combo_incoming_security;
-       GtkWidget *checkbox_incoming_auth;
-
-       GtkWidget *page_outgoing;
-       GtkWidget *entry_outgoingserver;
-       GtkWidget *combo_outgoing_security;
-       GtkWidget *combo_outgoing_auth;
-       GtkWidget *checkbox_outgoing_smtp_specific;
-       GtkWidget *button_outgoing_smtp_servers;
-       
-} 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_name (const gchar* account_name);
-
-G_END_DECLS
-
-#endif /* _MODEST_ACCOUNT_SETTINGS_DIALOG */
index 9350739..ebf1262 100644 (file)
@@ -38,6 +38,7 @@
 #include <string.h>
 #include "modest-tny-platform-factory.h"
 #include "maemo/easysetup/modest-easysetup-wizard.h"
+#include "maemo/modest-account-settings-dialog.h"
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -195,13 +196,21 @@ on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 static void
 on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 {
+       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;
+               
        /* Show the Account Settings window: */
-       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (void);
+       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
        modest_account_settings_dialog_set_account_name (dialog, account_name);
        
        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
        gtk_dialog_run (GTK_DIALOG (dialog));
        gtk_widget_destroy (GTK_WIDGET (dialog));
+       
+       g_free (account_name);
 }
 
 static void
@@ -217,7 +226,7 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 
 static void
 on_close_button_clicked (GtkWidget *button, gpointer user_data)
-{
+{              
        ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
 
        gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);