X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=21ba1cf5eba8b9552912c7a1668a33297792de99;hb=652527fd671cc695045b75893d7010c246585ef2;hp=e04aaf08c6c84e54a14ad87bc97dda385ed0d45d;hpb=6a5a4a54cba3fd795843678d87fd59f05d15e61f;p=modest diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index e04aaf0..21ba1cf 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -15,18 +15,20 @@ #include #include #include -#include -#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-hildon-includes.h" + +#include "widgets/modest-serversecurity-combo-box.h" +#include "widgets/modest-secureauth-combo-box.h" +#include "widgets/modest-validating-entry.h" +#include "widgets/modest-retrieve-combo-box.h" +#include "widgets/modest-limit-retrieve-combo-box.h" #include "modest-text-utils.h" #include "modest-account-mgr.h" #include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */ #include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */ #include "maemo/modest-connection-specific-smtp-window.h" +#include "maemo/modest-signature-editor-dialog.h" +#include #include #include /* For strlen(). */ @@ -86,11 +88,20 @@ modest_account_settings_dialog_finalize (GObject *object) { ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (object); - if (self->original_account_name) - g_free (self->original_account_name); + if (self->account_name) + g_free (self->account_name); + + if (self->original_account_title) + g_free (self->original_account_title); if (self->account_manager) g_object_unref (G_OBJECT (self->account_manager)); + + if (self->specific_window) + gtk_widget_destroy (self->specific_window); + + if (self->signature_dialog) + gtk_widget_destroy (self->signature_dialog); G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object); } @@ -101,6 +112,50 @@ show_error (GtkWindow *parent_window, const gchar* text); static void show_ok (GtkWindow *parent_window, const gchar* text); +static void +on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data); + +static void +on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data); + +static void +on_modified_combobox_changed (GtkComboBox *widget, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + self->modified = TRUE; +} + +static void +on_modified_entry_changed (GtkEditable *editable, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + self->modified = TRUE; +} + +static void +on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + self->modified = TRUE; +} + +/* Set a modified boolean whenever the widget is changed, + * so we can check for it later. + */ +static void +connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget) +{ + if (GTK_IS_ENTRY (widget)) { + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (on_modified_entry_changed), self); + } else if (GTK_IS_COMBO_BOX (widget)) { + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (on_modified_combobox_changed), self); + } else if (GTK_IS_TOGGLE_BUTTON (widget)) { + g_signal_connect (G_OBJECT (widget), "toggled", + G_CALLBACK (on_modified_checkbox_toggled), self); + } +} static void on_caption_entry_changed (GtkEditable *editable, gpointer user_data) @@ -161,12 +216,20 @@ static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *s return caption; } + +static void +on_entry_max (ModestValidatingEntry *self, gpointer user_data) +{ + ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + show_error (GTK_WINDOW (dialog), _("ckdg_ib_maximum_characters_reached")); +} + static GtkWidget* create_page_account_details (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, 2); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails")); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 2); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (label); /* Create a size group to be used by all captions. @@ -175,11 +238,15 @@ create_page_account_details (ModestAccountSettingsDialog *self) GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The description widgets: */ - self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ()); + self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); + /* Do use auto-capitalization: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_account_title), + HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); 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); + connect_for_modified (self, self->entry_account_title); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Prevent the use of some characters in the account title, @@ -196,23 +263,43 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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); + modest_validating_entry_set_unallowed_characters ( + MODEST_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. */ + * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (self->entry_account_title), 64); + modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_account_title), + on_entry_max, self); + + /* The retrieve combobox: */ + self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ()); + caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_retrievetype"), + self->combo_retrieve, NULL, HILDON_CAPTION_MANDATORY); + gtk_widget_show (self->combo_retrieve); + connect_for_modified (self, self->combo_retrieve); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); - /* TODO: The Retrieve and Limit Retrieve combo boxes. */ - + /* The limit-retrieve combobox: */ + self->combo_limit_retrieve = GTK_WIDGET (modest_limit_retrieve_combo_box_new ()); + caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"), + self->combo_limit_retrieve, NULL, HILDON_CAPTION_MANDATORY); + gtk_widget_show (self->combo_limit_retrieve); + connect_for_modified (self, self->combo_limit_retrieve); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); + /* The leave-messages widgets: */ if(!self->checkbox_leave_messages) - self->checkbox_leave_messages = - gtk_check_button_new_with_label (_("mcen_fi_advsetup_leave_on_server")); - gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, 2); + self->checkbox_leave_messages = gtk_check_button_new (); + caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), + self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY); gtk_widget_show (self->checkbox_leave_messages); - + connect_for_modified (self, self->checkbox_leave_messages); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); gtk_widget_show (GTK_WIDGET (box)); @@ -222,13 +309,43 @@ create_page_account_details (ModestAccountSettingsDialog *self) static void on_button_signature (GtkButton *button, gpointer user_data) { + ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + /* Create the window, if necessary: */ + if (!(self->signature_dialog)) { + self->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ()); + + gboolean use_signature = FALSE; + gchar *signature = modest_account_mgr_get_signature(self->account_manager, self->account_name, + &use_signature); + const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title)); + modest_signature_editor_dialog_set_settings ( + MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog), + use_signature, signature, account_title); + g_free (signature); + signature = NULL; + } + + /* Show the window: */ + gtk_window_set_transient_for (GTK_WINDOW (self->signature_dialog), GTK_WINDOW (self)); + gtk_window_set_modal (GTK_WINDOW (self->signature_dialog), TRUE); + const gint response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog)); + gtk_widget_hide (self->signature_dialog); + if (response != GTK_RESPONSE_OK) { + /* Destroy the widget now, and its data: */ + gtk_widget_destroy (self->signature_dialog); + self->signature_dialog = NULL; + } + else { + /* Mark modified, so we use the dialog's data later: */ + self->modified = TRUE; + } } static GtkWidget* create_page_user_details (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, 2); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -236,14 +353,19 @@ create_page_user_details (ModestAccountSettingsDialog *self) GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The name widgets: */ - self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ()); + self->entry_user_name = GTK_WIDGET (modest_validating_entry_new ()); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_name), HILDON_GTK_INPUT_MODE_FULL); /* 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. */ + * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64); + modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_name), + on_entry_max, self); GtkWidget *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); + connect_for_modified (self, self->entry_user_name); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Prevent the use of some characters in the name, @@ -251,58 +373,71 @@ create_page_user_details (ModestAccountSettingsDialog *self) 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); + modest_validating_entry_set_unallowed_characters ( + MODEST_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 ()); + self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ()); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_username), HILDON_GTK_INPUT_MODE_FULL); 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); + connect_for_modified (self, self->entry_user_username); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); 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)); + modest_validating_entry_set_unallowed_characters_whitespace ( + MODEST_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. */ + * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_username), 64); + modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_username), + on_entry_max, self); /* The password widgets: */ self->entry_user_password = gtk_entry_new (); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_password), HILDON_GTK_INPUT_MODE_FULL); 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); + connect_for_modified (self, self->entry_user_password); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The email address widgets: */ - self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ()); + self->entry_user_email = GTK_WIDGET (modest_validating_entry_new ()); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL); 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); + connect_for_modified (self, self->entry_user_email); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); 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. */ + * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_email), 64); - + modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_email), + on_entry_max, self); /* Signature button: */ if (!self->button_signature) - self->button_signature = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit")); + self->button_signature = gtk_button_new_with_label (_("mcen_bd_edit")); caption = hildon_caption_new (sizegroup, _("mcen_fi_email_signature"), self->button_signature, NULL, HILDON_CAPTION_OPTIONAL); + hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); gtk_widget_show (self->button_signature); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); g_signal_connect (G_OBJECT (self->button_signature), "clicked", @@ -339,13 +474,13 @@ static void update_incoming_server_security_choices (ModestAccountSettingsDialog { /* 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); + modest_serversecurity_combo_box_fill ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol); } static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, 2); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -355,6 +490,8 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) /* The incoming server widgets: */ if(!self->entry_incomingserver) self->entry_incomingserver = gtk_entry_new (); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL); if (self->caption_incoming) gtk_widget_destroy (self->caption_incoming); @@ -365,35 +502,45 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) self->caption_incoming = create_caption_new_with_asterix (self, sizegroup, "Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY); gtk_widget_show (self->entry_incomingserver); - gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2); + connect_for_modified (self, self->entry_incomingserver); + gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->caption_incoming); /* The secure connection widgets: */ /* This will be filled by update_incoming_server_security_choices(). */ if (!self->combo_incoming_security) - self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ()); + self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); GtkWidget *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); + connect_for_modified (self, self->combo_incoming_security); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); + /* Show a default port number when the security method changes, as per the UI spec: */ + g_signal_connect (G_OBJECT (self->combo_incoming_security), "changed", (GCallback)on_combo_incoming_security_changed, self); + + /* The port widgets: */ /* TODO: There are various rules about this in the UI spec. */ if (!self->entry_incoming_port) - self->entry_incoming_port = GTK_WIDGET (gtk_entry_new ()); + self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), self->entry_incoming_port, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->entry_incoming_port); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2); + connect_for_modified (self, self->entry_incoming_port); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The secure authentication widgets: */ 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); + self->checkbox_incoming_auth = gtk_check_button_new (); + caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), + self->checkbox_incoming_auth, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->checkbox_incoming_auth); + connect_for_modified (self, self->checkbox_incoming_auth); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); gtk_widget_show (GTK_WIDGET (box)); @@ -421,29 +568,24 @@ enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button) /* 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); + /* Create the window if necessary: */ + if (!(self->specific_window)) { + self->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); + modest_connection_specific_smtp_window_fill_with_connections ( + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager, + self->account_name); + } + + /* Show the window: */ + gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self)); + gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE); + gtk_widget_show (self->specific_window); } static void @@ -452,17 +594,48 @@ on_combo_outgoing_auth_changed (GtkComboBox *widget, gpointer user_data) ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); ModestProtocol protocol_security = - easysetup_secureauth_combo_box_get_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth)); + modest_secureauth_combo_box_get_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth)); const gboolean secureauth_used = protocol_security != MODEST_PROTOCOL_AUTH_NONE; gtk_widget_set_sensitive (self->caption_outgoing_username, secureauth_used); gtk_widget_set_sensitive (self->caption_outgoing_password, secureauth_used); } +static void +on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + + const gint port_number = + modest_serversecurity_combo_box_get_active_serversecurity_port ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security)); + + if(port_number != 0) { + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (self->entry_outgoing_port), port_number); + } +} + +static void +on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + + const gint port_number = + modest_serversecurity_combo_box_get_active_serversecurity_port ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security)); + + if(port_number != 0) { + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (self->entry_incoming_port), port_number); + } +} + + static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, 2); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -472,88 +645,114 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* The outgoing server widgets: */ if (!self->entry_outgoingserver) self->entry_outgoingserver = gtk_entry_new (); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); 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); + connect_for_modified (self, self->entry_outgoingserver); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The secure authentication widgets: */ if (!self->combo_outgoing_auth) - self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ()); + self->combo_outgoing_auth = GTK_WIDGET (modest_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); + connect_for_modified (self, self->combo_outgoing_auth); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */ g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self); /* The username widgets: */ - self->entry_outgoing_username = GTK_WIDGET (easysetup_validating_entry_new ()); + self->entry_outgoing_username = GTK_WIDGET (modest_validating_entry_new ()); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_username), HILDON_GTK_INPUT_MODE_FULL); self->caption_outgoing_username = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), self->entry_outgoing_username, NULL, HILDON_CAPTION_MANDATORY); gtk_widget_show (self->entry_outgoing_username); - gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, 2); + connect_for_modified (self, self->entry_outgoing_username); + gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->caption_outgoing_username); /* Prevent the use of some characters in the username, * as required by our UI specification: */ - easysetup_validating_entry_set_unallowed_characters_whitespace ( - EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username)); + modest_validating_entry_set_unallowed_characters_whitespace ( + MODEST_VALIDATING_ENTRY (self->entry_outgoing_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. */ + * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (self->entry_outgoing_username), 64); - + modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_outgoing_username), + on_entry_max, self); + /* The password widgets: */ self->entry_outgoing_password = gtk_entry_new (); + /* Auto-capitalization is the default, so let's turn it off: */ + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_password), HILDON_GTK_INPUT_MODE_FULL); gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */ self->caption_outgoing_password = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_password"), self->entry_outgoing_password, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->entry_outgoing_password); - gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, 2); + connect_for_modified (self, self->entry_outgoing_password); + gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->caption_outgoing_password); /* The secure connection widgets: */ - /* This will be filled and set with easysetup_serversecurity_combo_box_fill() - * and easysetup_serversecurity_combo_box_set_active_serversecurity(). + /* This will be filled and set with modest_serversecurity_combo_box_fill() + * and modest_serversecurity_combo_box_set_active_serversecurity(). */ if (!self->combo_outgoing_security) - self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ()); + self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); 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); + connect_for_modified (self, self->combo_outgoing_security); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); + + /* Show a default port number when the security method changes, as per the UI spec: */ + g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed", (GCallback)on_combo_outgoing_security_changed, self); /* The port widgets: */ if (!self->entry_outgoing_port) - self->entry_outgoing_port = GTK_WIDGET (gtk_entry_new ()); + self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), self->entry_outgoing_port, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->entry_outgoing_port); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2); + connect_for_modified (self, self->entry_outgoing_port); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); + GtkWidget *separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (separator); + /* connection-specific checkbox: */ if (!self->checkbox_outgoing_smtp_specific) { - self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp")); + self->checkbox_outgoing_smtp_specific = gtk_check_button_new (); 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); + caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), + self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->checkbox_outgoing_smtp_specific); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (caption); + connect_for_modified (self, self->checkbox_outgoing_smtp_specific); /* Connection-specific SMTP-Severs Edit button: */ if (!self->button_outgoing_smtp_servers) - self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit")); + self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit")); caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL); + hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); gtk_widget_show (self->button_outgoing_smtp_servers); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Only enable the button when the checkbox is checked: */ @@ -573,14 +772,14 @@ static gboolean check_data (ModestAccountSettingsDialog *self) { /* Check that the title is not already in use: */ - const gchar* account_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title)); - if ((!account_name) || (strlen(account_name) == 0)) + const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title)); + if ((!account_title) || (strlen(account_title) == 0)) return FALSE; /* Should be prevented already anyway. */ - if (strcmp(account_name, self->original_account_name) != 0) { + if (strcmp(account_title, self->original_account_title) != 0) { /* Check the changed title: */ const gboolean name_in_use = modest_account_mgr_account_with_display_name_exists (self->account_manager, - account_name); + account_title); if (name_in_use) { /* Warn the user via a dialog: */ @@ -608,6 +807,8 @@ check_data (ModestAccountSettingsDialog *self) /* TODO: The UI Spec wants us to check that the servernames are valid, * but does not specify how. */ + + return TRUE; } /* */ @@ -619,13 +820,10 @@ on_response (GtkDialog *wizard_dialog, ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (wizard_dialog); enable_buttons (self); - /* TODO: Prevent the OK response if the data is invalid. */ - gboolean prevent_response = FALSE; /* Warn about unsaved changes: */ - /* TODO: Actually detect whether changes were made. */ - if (response_id == GTK_RESPONSE_CANCEL) { + if (response_id == GTK_RESPONSE_CANCEL && self->modified) { GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (GTK_WINDOW (self), (GtkDialogFlags)0, GTK_MESSAGE_INFO, @@ -697,6 +895,7 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) GtkDialog *dialog = GTK_DIALOG (self); gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook)); + gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF); gtk_widget_show (GTK_WIDGET (notebook)); /* Add the buttons: */ @@ -709,7 +908,9 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) * to stop the default signal handler from closing the dialog. */ g_signal_connect (G_OBJECT (self), "response", - G_CALLBACK (on_response), self); + G_CALLBACK (on_response), self); + + self->modified = FALSE; } ModestAccountSettingsDialog* @@ -726,11 +927,12 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo if (!account_name) return; - /* Save the account name so we can refer to it if the user changes it: */ - if (dialog->original_account_name) - g_free (dialog->original_account_name); - dialog->original_account_name = g_strdup (account_name); + /* Save the account name so we can refer to it later: */ + if (dialog->account_name) + g_free (dialog->account_name); + dialog->account_name = g_strdup (account_name); + /* Get the account data for this account name: */ ModestAccountData *account_data = modest_account_mgr_get_account_data (dialog->account_manager, account_name); @@ -738,6 +940,12 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo g_printerr ("modest: failed to get account data for %s\n", account_name); return; } + + /* Save the account title so we can refer to it if the user changes it: */ + if (dialog->original_account_title) + g_free (dialog->original_account_title); + dialog->original_account_title = g_strdup (account_data->display_name); + if (!(account_data->store_account)) { g_printerr ("modest: account has no stores: %s\n", account_name); @@ -756,12 +964,36 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_email), account_data->email ? account_data->email : ""); + ModestServerAccountData *incoming_account = account_data->store_account; + + if (incoming_account) + modest_retrieve_combo_box_fill (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), incoming_account->proto); + gchar *retrieve = modest_account_mgr_get_string (dialog->account_manager, account_name, + MODEST_ACCOUNT_RETRIEVE, FALSE /* not server account */); + if (!retrieve) { + /* Default to something, though no default is specified in the UI spec: */ + retrieve = g_strdup (MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY); + } + modest_retrieve_combo_box_set_active_retrieve_conf (MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve), retrieve); + g_free (retrieve); + + const gint limit_retrieve = modest_account_mgr_get_int (dialog->account_manager, account_name, + MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE /* not server account */); + modest_limit_retrieve_combo_box_set_active_limit_retrieve (MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve), limit_retrieve); + + const gboolean leave_on_server = modest_account_mgr_get_bool (dialog->account_manager, account_name, MODEST_ACCOUNT_LEAVE_ON_SERVER, FALSE /* not server account */); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages), leave_on_server); - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages), leave_on_server); + + /* Only show the leave-on-server checkbox for POP, + * as per the UI spec: */ + if (incoming_account->proto != MODEST_PROTOCOL_STORE_POP) { + gtk_widget_hide (dialog->checkbox_leave_messages); + } else { + gtk_widget_show (dialog->checkbox_leave_messages); + } - ModestServerAccountData *incoming_account = account_data->store_account; if (incoming_account) { gtk_entry_set_text( GTK_ENTRY (dialog->entry_user_username), incoming_account->username ? incoming_account->username : ""); @@ -771,18 +1003,23 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver), incoming_account->hostname ? incoming_account->hostname : ""); - easysetup_serversecurity_combo_box_set_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), incoming_account->proto); + const ModestProtocol secure_auth = modest_server_account_get_secure_auth( + dialog->account_manager, incoming_account->account_name); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), + secure_auth == MODEST_PROTOCOL_AUTH_PASSWORD); + update_incoming_server_title (dialog, incoming_account->proto); update_incoming_server_security_choices (dialog, incoming_account->proto); - /* TODO: - gchar *uri; - ModestProtocol proto; - gchar *password; - time_t last_updated; - GSList *options; - */ + const ModestProtocol security = modest_server_account_get_security ( + dialog->account_manager, incoming_account->account_name); + modest_serversecurity_combo_box_set_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security); + + const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name, + MODEST_ACCOUNT_PORT, TRUE /* server account */); + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (dialog->entry_incoming_port), port_num); } @@ -791,42 +1028,50 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoingserver), outgoing_account->hostname ? outgoing_account->hostname : ""); - /* TODO: Dim these if secure authentication is None, as per the UI spec: */ gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_username), outgoing_account->username ? outgoing_account->username : ""); gtk_entry_set_text( GTK_ENTRY (dialog->entry_outgoing_password), outgoing_account->password ? outgoing_account->password : ""); - /* TODO: How do we get the auth setting from the server account struct?: */ - /* This seems to be in ->options, with hard-coded option names. - * This will need new API in ModestAccountMgr. */ - easysetup_secureauth_combo_box_set_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), MODEST_PROTOCOL_AUTH_NONE); + /* Get the secure-auth setting: */ + const ModestProtocol secure_auth = modest_server_account_get_secure_auth( + dialog->account_manager, outgoing_account->account_name); + modest_secureauth_combo_box_set_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth); on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog); - easysetup_serversecurity_combo_box_fill ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto); + modest_serversecurity_combo_box_fill ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto); + /* Get the security setting: */ + const ModestProtocol security = modest_server_account_get_security ( + dialog->account_manager, outgoing_account->account_name); + modest_serversecurity_combo_box_set_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security); - - /* TODO: set port. */ + const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name, + MODEST_ACCOUNT_PORT, TRUE /* server account */); + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port), port_num); } - /* TODO: account_data->display_name */ /* account_data->is_enabled, */ /*account_data->is_default, */ /* account_data->store_account->proto */ modest_account_mgr_free_account_data (dialog->account_manager, account_data); + + /* Unset the modified flag so we can detect changes later: */ + dialog->modified = FALSE; } static gboolean save_configuration (ModestAccountSettingsDialog *dialog) { - g_assert (dialog->original_account_name); + g_assert (dialog->account_name); - const gchar* account_name = dialog->original_account_name; + const gchar* account_name = dialog->account_name; /* Set the account data from the widgets: */ const gchar* user_name = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name)); @@ -840,11 +1085,29 @@ save_configuration (ModestAccountSettingsDialog *dialog) MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */); if (!test) return FALSE; - - /* TODO: Change name: */ - /* Possibly the account name may never change, but that should be hidden, - * and the display name may change, defaulting to the account name. - */ + + /* Signature: */ + if (dialog->signature_dialog) { + gboolean use_signature = FALSE; + gchar *signature = modest_signature_editor_dialog_get_settings ( + MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog), + &use_signature); + + modest_account_mgr_set_signature(dialog->account_manager, account_name, + signature, use_signature); + g_free (signature); + } + + gchar *retrieve = modest_retrieve_combo_box_get_active_retrieve_conf ( + MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve)); + modest_account_mgr_set_string (dialog->account_manager, account_name, + MODEST_ACCOUNT_RETRIEVE, retrieve, FALSE /* not server account */); + g_free (retrieve); + + const gint limit_retrieve = modest_limit_retrieve_combo_box_get_active_limit_retrieve ( + MODEST_LIMIT_RETRIEVE_COMBO_BOX (dialog->combo_limit_retrieve)); + modest_account_mgr_set_int (dialog->account_manager, account_name, + MODEST_ACCOUNT_LIMIT_RETRIEVE, limit_retrieve, FALSE /* not server account */); const gboolean leave_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages)); test = modest_account_mgr_set_bool (dialog->account_manager, account_name, @@ -875,16 +1138,22 @@ save_configuration (ModestAccountSettingsDialog *dialog) if (!test) return FALSE; - /* TODO: How can we set these in the server account?: - ModestProtocol protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) + const ModestProtocol protocol_authentication_incoming = gtk_toggle_button_get_active + (GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth)) ? MODEST_PROTOCOL_AUTH_PASSWORD : MODEST_PROTOCOL_AUTH_NONE; + modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming); - ModestProtocol protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security)); - - */ - + const ModestProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security)); + modest_server_account_set_security (dialog->account_manager, incoming_account_name, protocol_security_incoming); + + /* port: */ + gint port_num = hildon_number_editor_get_value ( + HILDON_NUMBER_EDITOR (dialog->entry_incoming_port)); + modest_account_mgr_set_int (dialog->account_manager, incoming_account_name, + MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */); + g_free (incoming_account_name); /* Outgoing: */ @@ -910,14 +1179,20 @@ save_configuration (ModestAccountSettingsDialog *dialog) if (!test) return FALSE; - /* TODO: How do we set these in the account data?: - ModestProtocol protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security)); + const ModestProtocol protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security)); + modest_server_account_set_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing); - ModestProtocol protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth)); - */ + const ModestProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth)); + modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing); + /* port: */ + port_num = hildon_number_editor_get_value ( + HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port)); + modest_account_mgr_set_int (dialog->account_manager, outgoing_account_name, + MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */); + g_free (outgoing_account_name); @@ -934,7 +1209,12 @@ save_configuration (ModestAccountSettingsDialog *dialog) return FALSE; } - return TRUE; + /* Save connection-specific SMTP server accounts: */ + if (dialog->specific_window) + return modest_connection_specific_smtp_window_save_server_accounts ( + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name); + else + return TRUE; } static gboolean entry_is_empty (GtkWidget *entry) @@ -995,27 +1275,33 @@ modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *kla static void show_error (GtkWindow *parent_window, const gchar* text) { + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, 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)); + */ + + gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void show_ok (GtkWindow *parent_window, const gchar* text) { + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); + /* GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, (GtkDialogFlags)0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, text )); + */ - gtk_dialog_run (dialog); - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); }