X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=43cb5c972827441fc52b91dc1e42482d896b4131;hb=06941d1065d0885758d057108e8f6b317a02d952;hp=26fba30c7de7d8f8c5cac7408cc014a4b04f9a75;hpb=e2c96371eac2c3b33a131bc7f75704203205de71;p=modest diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 26fba30..43cb5c9 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -55,10 +55,7 @@ #include "maemo/modest-signature-editor-dialog.h" #include "maemo/modest-maemo-utils.h" #include "widgets/modest-ui-constants.h" - -#include -#include -#include +#include #include #include @@ -69,8 +66,6 @@ #include #endif -#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com" - #define PORT_MIN 1 #define PORT_MAX 65535 @@ -142,9 +137,6 @@ modest_account_settings_dialog_finalize (GObject *object) } static void -show_error (GtkWidget *parent_widget, const gchar* text); - -static void on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data); static void @@ -178,6 +170,15 @@ on_modified_number_editor_changed (HildonNumberEditor *number_editor, gint new_v self->modified = TRUE; } +static void +on_number_editor_notify (HildonNumberEditor *editor, GParamSpec *arg1, gpointer user_data) +{ + ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + gint value = hildon_number_editor_get_value (editor); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0); +} + /* Set a modified boolean whenever the widget is changed, * so we can check for it later. */ @@ -187,6 +188,7 @@ connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget) if (HILDON_IS_NUMBER_EDITOR (widget)) { g_signal_connect (G_OBJECT (widget), "notify::value", G_CALLBACK (on_modified_number_editor_changed), self); + g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_editor_notify), self); } else if (GTK_IS_ENTRY (widget)) { g_signal_connect (G_OBJECT (widget), "changed", @@ -265,7 +267,7 @@ on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gch tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH); msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp); - show_error (GTK_WIDGET (self), msg); + hildon_banner_show_information(GTK_WIDGET (self), NULL, msg); g_free (msg); g_free (tmp); @@ -279,7 +281,7 @@ on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* c tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH); msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp); - show_error (GTK_WIDGET (self), msg); + hildon_banner_show_information(GTK_WIDGET (self), NULL, msg); g_free (msg); g_free (tmp); @@ -289,22 +291,23 @@ on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* c static void on_entry_max (ModestValidatingEntry *self, gpointer user_data) { - /* ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */ - show_error (GTK_WIDGET (self), _CS("ckdg_ib_maximum_characters_reached")); + hildon_banner_show_information(GTK_WIDGET (self), NULL, + _CS("ckdg_ib_maximum_characters_reached")); } static GtkWidget* create_page_account_details (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails")); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (label); + GtkAdjustment *focus_adjustment = NULL; /* 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); + GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The description widgets: */ self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); @@ -376,7 +379,13 @@ create_page_account_details (ModestAccountSettingsDialog *self) gtk_widget_show (GTK_WIDGET (box)); - return GTK_WIDGET (box); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box); + gtk_widget_show (scrollwin); + + focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); + + return GTK_WIDGET (scrollwin); } static gchar* @@ -420,6 +429,7 @@ on_button_signature (GtkButton *button, gpointer user_data) modest_signature_editor_dialog_set_settings ( MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog), use_signature, signature, account_title); + g_free (account_title); account_title = NULL; g_free (signature); @@ -527,7 +537,7 @@ create_page_user_details (ModestAccountSettingsDialog *self) hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL); caption = create_caption_new_with_asterisk (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_entry_set_text (GTK_ENTRY (self->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */ gtk_widget_show (self->entry_user_email); connect_for_modified (self, self->entry_user_email); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -697,14 +707,14 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) 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); + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager); } /* Show the window: */ gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self)); gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE); - gtk_widget_show (self->specific_window); + gtk_widget_show (self->specific_window); + self->modified = TRUE; } static void @@ -899,40 +909,6 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) return GTK_WIDGET (scrollwin); } - - -/** TODO: This doesn't work because hildon_number_editor_get_value() does not work until - * focus has been lost: - * See https://bugs.maemo.org/show_bug.cgi?id=1806. - */ -static gboolean -check_hildon_number_editor_and_warn_value_not_in_range (HildonNumberEditor *widget, gint min, gint max) -{ - g_return_val_if_fail (widget, FALSE); - - const gint port = hildon_number_editor_get_value (widget); - /* printf ("DEBUG: %s, port=%d\n", __FUNCTION__, port); */ - if (port < PORT_MIN || - port > PORT_MAX) { - - /* Warn the user via a dialog: */ - /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ - gchar *message = g_strdup_printf (_CS("ckct_ib_set_a_value_within_range"), - min, - max); - hildon_banner_show_information (GTK_WIDGET (widget), NULL, message); - g_free (message); - message = NULL; - - /* Return focus to the email address entry: */ - gtk_widget_grab_focus (GTK_WIDGET (widget)); - - return FALSE; - } - - return TRUE; -} - static gboolean check_data (ModestAccountSettingsDialog *self) @@ -967,7 +943,6 @@ check_data (ModestAccountSettingsDialog *self) if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ - /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); /* Return focus to the email address entry: */ @@ -984,7 +959,6 @@ check_data (ModestAccountSettingsDialog *self) if (!modest_text_utils_validate_domain_name (hostname)) { /* Warn the user via a dialog: */ - /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername")); /* Return focus to the email address entry: */ @@ -1001,7 +975,6 @@ check_data (ModestAccountSettingsDialog *self) if (!modest_text_utils_validate_domain_name (hostname2)) { /* Warn the user via a dialog: */ - /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ hildon_banner_show_information (self->entry_outgoingserver, NULL, _("mcen_ib_invalid_servername")); /* Return focus to the email address entry: */ @@ -1010,18 +983,6 @@ check_data (ModestAccountSettingsDialog *self) return FALSE; } - /* Check that the port numbers are acceptable: */ - if (!check_hildon_number_editor_and_warn_value_not_in_range ( - HILDON_NUMBER_EDITOR (self->entry_incoming_port), PORT_MIN, PORT_MAX)) { - return FALSE; - } - - if (!check_hildon_number_editor_and_warn_value_not_in_range ( - HILDON_NUMBER_EDITOR (self->entry_outgoing_port), PORT_MIN, PORT_MAX)) { - return FALSE; - } - - /* Find a suitable authentication method when secure authentication is desired */ const gint port_num = hildon_number_editor_get_value ( @@ -1033,8 +994,9 @@ check_data (ModestAccountSettingsDialog *self) MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security)); */ /* If we use an encrypted protocol then there is no need to encrypt the password */ - /* I don't think this is a good assumption. It overrides the user's request. murrayc: */ - if (!modest_protocol_info_is_secure(protocol_security_incoming)) + /* I don't think this is a good assumption. It overrides the user's request. murrayc: + * if (!modest_protocol_info_is_secure(protocol_security_incoming)) */ + if (TRUE) { if (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth))) { @@ -1049,7 +1011,7 @@ check_data (ModestAccountSettingsDialog *self) GList* method; for (method = list_auth_methods; method != NULL; method = g_list_next(method)) { - ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(list_auth_methods->data)); + ModestAuthProtocol proto = (ModestAuthProtocol)(GPOINTER_TO_INT(method->data)); // Allow secure methods, e.g MD5 only if (modest_protocol_info_auth_is_secure(proto)) { @@ -1065,9 +1027,8 @@ check_data (ModestAccountSettingsDialog *self) { if(error == NULL || error->domain != modest_maemo_utils_get_supported_secure_authentication_error_quark() || error->code != MODEST_MAEMO_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED) - { - show_error (GTK_WIDGET (self), _("Could not discover supported secure authentication methods.")); - } + hildon_banner_show_information(GTK_WIDGET (self), NULL, + _("Could not discover supported secure authentication methods.")); if(error != NULL) g_error_free(error); @@ -1126,15 +1087,37 @@ on_response (GtkDialog *wizard_dialog, if (saved) { /* Do not show the account-saved dialog if we are just saving this * temporarily, because from the user's point of view it will not - * really be saved (saved + enabled) until later. + * really be saved (saved + enabled) until later */ - const gboolean enabled = - modest_account_mgr_get_enabled (self->account_manager, self->account_name); - if (enabled) - show_error (NULL, _("mcen_ib_advsetup_settings_saved")); + if (modest_account_mgr_get_enabled (self->account_manager, + self->account_name)) { + gchar *incoming_account_name = NULL, *outgoing_account_name = NULL; + + incoming_account_name = + modest_account_mgr_get_server_account_name (self->account_manager, + self->account_name, + TNY_ACCOUNT_TYPE_STORE); + outgoing_account_name = + modest_account_mgr_get_server_account_name (self->account_manager, + self->account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + + if (incoming_account_name) { + modest_account_mgr_notify_account_update (self->account_manager, + incoming_account_name); + g_free (incoming_account_name); + } + if (outgoing_account_name) { + modest_account_mgr_notify_account_update (self->account_manager, + outgoing_account_name); + g_free (outgoing_account_name); + } + + hildon_banner_show_information(NULL, NULL, _("mcen_ib_advsetup_settings_saved")); + } + } else { + hildon_banner_show_information (NULL, NULL, _("mail_ib_setting_failed")); } - else - show_error (NULL, _("mail_ib_setting_failed")); } } } @@ -1190,11 +1173,14 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) G_CALLBACK (on_response), self); self->modified = FALSE; - + /* When this window is shown, hibernation should not be possible, * because there is no sensible way to save the state: */ modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); + + hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings", + modest_maemo_utils_get_osso_context()); } ModestAccountSettingsDialog* @@ -1252,8 +1238,9 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo 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 */); + + + gchar *retrieve = modest_account_mgr_get_retrieve_type (dialog->account_manager, account_name); if (!retrieve) { /* Default to something, though no default is specified in the UI spec: */ retrieve = g_strdup (MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY); @@ -1261,13 +1248,11 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo 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 */); + const gint limit_retrieve = modest_account_mgr_get_retrieve_limit (dialog->account_manager, account_name); 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 */); + const gboolean leave_on_server = modest_account_mgr_get_leave_on_server (dialog->account_manager, account_name); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->checkbox_leave_messages), leave_on_server); /* Only show the leave-on-server checkbox for POP, @@ -1296,7 +1281,7 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported? */ - const ModestConnectionProtocol security = modest_server_account_get_security ( + const ModestConnectionProtocol security = modest_account_mgr_get_server_account_security ( dialog->account_manager, incoming_account->account_name); modest_serversecurity_combo_box_set_active_serversecurity ( MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security); @@ -1306,26 +1291,24 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo OR - use encrypted passwords */ - const ModestAuthProtocol secure_auth = modest_server_account_get_secure_auth( + const ModestAuthProtocol secure_auth = modest_account_mgr_get_server_account_secure_auth( dialog->account_manager, incoming_account->account_name); dialog->protocol_authentication_incoming = secure_auth; - if (modest_protocol_info_is_secure(security) || - modest_protocol_info_auth_is_secure(secure_auth)) + if (modest_protocol_info_auth_is_secure(secure_auth)) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), - TRUE); + TRUE); } else { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth), - FALSE); + FALSE); }; update_incoming_server_title (dialog, incoming_account->proto); - const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name, - MODEST_ACCOUNT_PORT, TRUE /* server account */); - + const gint port_num = modest_account_mgr_get_server_account_port (dialog->account_manager, + incoming_account->account_name); if (port_num == 0) { /* Show the appropriate port number: */ on_combo_incoming_security_changed ( @@ -1352,7 +1335,7 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo outgoing_account->password ? outgoing_account->password : ""); /* Get the secure-auth setting: */ - const ModestAuthProtocol secure_auth = modest_server_account_get_secure_auth( + const ModestAuthProtocol secure_auth = modest_account_mgr_get_server_account_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); @@ -1362,13 +1345,13 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto); /* Get the security setting: */ - const ModestConnectionProtocol security = modest_server_account_get_security ( + const ModestConnectionProtocol security = modest_account_mgr_get_server_account_security ( dialog->account_manager, outgoing_account->account_name); modest_serversecurity_combo_box_set_active_serversecurity ( MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security); - const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name, - MODEST_ACCOUNT_PORT, TRUE /* server account */); + const gint port_num = modest_account_mgr_get_server_account_port (dialog->account_manager, + outgoing_account->account_name); if (port_num == 0) { /* Show the appropriate port number: */ on_combo_outgoing_security_changed ( @@ -1383,8 +1366,7 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo const gboolean has_specific = modest_account_mgr_get_use_connection_specific_smtp ( - dialog->account_manager, - account_name); + dialog->account_manager, account_name); gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON (dialog->checkbox_outgoing_smtp_specific), has_specific); @@ -1441,69 +1423,60 @@ save_configuration (ModestAccountSettingsDialog *dialog) 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)); - gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name, - MODEST_ACCOUNT_FULLNAME, user_name, FALSE /* not server account */); - if (!test) - return FALSE; - + const gchar* user_fullname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_name)); + modest_account_mgr_set_user_fullname (dialog->account_manager, + account_name, + user_fullname); + const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_email)); - test = modest_account_mgr_set_string (dialog->account_manager, account_name, - MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */); - if (!test) - return FALSE; + modest_account_mgr_set_user_email (dialog->account_manager, account_name, + emailaddress); /* Signature: */ if (dialog->signature_dialog) { gboolean use_signature = FALSE; - gchar *signature = modest_signature_editor_dialog_get_settings ( - MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog), - &use_signature); + 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); - } + 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 */); + modest_account_mgr_set_retrieve_type (dialog->account_manager, account_name, (const gchar*) retrieve); 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 */); + modest_account_mgr_set_retrieve_limit (dialog->account_manager, account_name, limit_retrieve); 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, - MODEST_ACCOUNT_LEAVE_ON_SERVER, leave_on_server, FALSE /* not server account */); - if (!test) - return FALSE; + modest_account_mgr_set_leave_on_server (dialog->account_manager, account_name, leave_on_server); /* Incoming: */ - gchar* incoming_account_name = modest_account_mgr_get_string (dialog->account_manager, account_name, - MODEST_ACCOUNT_STORE_ACCOUNT, FALSE /* not server account */); + gchar* incoming_account_name = + modest_account_mgr_get_server_account_name (dialog->account_manager, + account_name, + TNY_ACCOUNT_TYPE_STORE); g_assert (incoming_account_name); const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incomingserver)); - test = modest_account_mgr_set_string (dialog->account_manager, incoming_account_name, - MODEST_ACCOUNT_HOSTNAME, hostname, TRUE /* server account */); - if (!test) - return FALSE; + modest_account_mgr_set_server_account_hostname (dialog->account_manager, incoming_account_name, hostname); const gchar* username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_username)); - modest_server_account_set_username (dialog->account_manager, incoming_account_name, username); + modest_account_mgr_set_server_account_username (dialog->account_manager, incoming_account_name, username); const gchar* password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_user_password)); - modest_server_account_set_password (dialog->account_manager, incoming_account_name, password); + modest_account_mgr_set_server_account_password (dialog->account_manager, incoming_account_name, + password); /* 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 */); + modest_account_mgr_set_server_account_port (dialog->account_manager, incoming_account_name, port_num); /* The UI spec says: * If secure authentication is unchecked, allow sending username and password also as plain text. @@ -1512,46 +1485,45 @@ save_configuration (ModestAccountSettingsDialog *dialog) const ModestConnectionProtocol 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); + modest_account_mgr_set_server_account_security (dialog->account_manager, incoming_account_name, protocol_security_incoming); - modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, dialog->protocol_authentication_incoming); + modest_account_mgr_set_server_account_secure_auth (dialog->account_manager, incoming_account_name, dialog->protocol_authentication_incoming); g_free (incoming_account_name); /* Outgoing: */ - gchar* outgoing_account_name = modest_account_mgr_get_string (dialog->account_manager, account_name, - MODEST_ACCOUNT_TRANSPORT_ACCOUNT, FALSE /* not server account */); + gchar* outgoing_account_name = + modest_account_mgr_get_server_account_name (dialog->account_manager, + account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); g_assert (outgoing_account_name); hostname = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoingserver)); - test = modest_account_mgr_set_string (dialog->account_manager, outgoing_account_name, - MODEST_ACCOUNT_HOSTNAME, hostname, TRUE /* server account */); - if (!test) - return FALSE; + modest_account_mgr_set_server_account_hostname (dialog->account_manager, outgoing_account_name, hostname); username = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_username)); - modest_server_account_set_username (dialog->account_manager, outgoing_account_name, + modest_account_mgr_set_server_account_username (dialog->account_manager, outgoing_account_name, username); password = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_password)); - modest_server_account_set_password (dialog->account_manager, outgoing_account_name, - password); + modest_account_mgr_set_server_account_password (dialog->account_manager, outgoing_account_name, + password); const ModestConnectionProtocol 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); + modest_account_mgr_set_server_account_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing); const ModestAuthProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth ( MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth)); - modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing); + modest_account_mgr_set_server_account_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 */); - + modest_account_mgr_set_server_account_port (dialog->account_manager, + outgoing_account_name, + port_num); g_free (outgoing_account_name); @@ -1560,28 +1532,21 @@ save_configuration (ModestAccountSettingsDialog *dialog) if (!account_title) return FALSE; /* Should be prevented already anyway. */ - if (strcmp(account_title, account_name) != 0) { - /* Change the title: */ - const gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name, - MODEST_ACCOUNT_DISPLAY_NAME, account_title, FALSE /* not server account */); - if (!test) { - g_free (account_title); - return FALSE; - } - } - +/* if (strcmp (account_title, account_name) != 0) { */ + modest_account_mgr_set_display_name (dialog->account_manager, account_name, account_title); +/* } */ g_free (account_title); account_title = NULL; /* Save connection-specific SMTP server accounts: */ - modest_account_mgr_set_use_connection_specific_smtp(dialog->account_manager, account_name, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific))); + modest_account_mgr_set_use_connection_specific_smtp(dialog->account_manager, account_name, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->checkbox_outgoing_smtp_specific))); if (dialog->specific_window) { return modest_connection_specific_smtp_window_save_server_accounts ( - MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name); - } - else + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window)); + } else { return TRUE; + } } static gboolean entry_is_empty (GtkWidget *entry) @@ -1649,23 +1614,3 @@ modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *kla object_class->dispose = modest_account_settings_dialog_dispose; object_class->finalize = modest_account_settings_dialog_finalize; } - -static void -show_error (GtkWidget *parent_widget, const gchar* text) -{ - hildon_banner_show_information(parent_widget, NULL, text); - -#if 0 - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_widget, 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 -}