X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=12656cb6fe522b9569d6b3ee9a352e50188ff9fd;hp=1f1759659b2646524bc6064a7d8b8ff387f68c2f;hb=fcbc6a6dfa1a10921d2ca889256a21b192adbe98;hpb=66777ceddacb0bc81031ecacc84ab64875532af2 diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 1f17596..12656cb 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -71,6 +71,9 @@ #define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com" +#define PORT_MIN 1 +#define PORT_MAX 65535 + G_DEFINE_TYPE (ModestAccountSettingsDialog, modest_account_settings_dialog, GTK_TYPE_DIALOG); #define ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(o) \ @@ -80,7 +83,6 @@ typedef struct _ModestAccountSettingsDialogPrivate ModestAccountSettingsDialogPr struct _ModestAccountSettingsDialogPrivate { - guint initial_port; }; static void @@ -140,10 +142,7 @@ modest_account_settings_dialog_finalize (GObject *object) } static void -show_error (GtkWindow *parent_window, const gchar* text); - -static void -show_ok (GtkWindow *parent_window, const gchar* text); +show_error (GtkWidget *parent_widget, const gchar* text); static void on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data); @@ -172,21 +171,32 @@ on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data) self->modified = TRUE; } +static void +on_modified_number_editor_changed (HildonNumberEditor *number_editor, gint new_value, 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); + if (HILDON_IS_NUMBER_EDITOR (widget)) { + g_signal_connect (G_OBJECT (widget), "notify::value", + G_CALLBACK (on_modified_number_editor_changed), self); + } + else if (GTK_IS_ENTRY (widget)) { + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (on_modified_entry_changed), self); } else if (GTK_IS_COMBO_BOX (widget)) { g_signal_connect (G_OBJECT (widget), "changed", - G_CALLBACK (on_modified_combobox_changed), self); + 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); + G_CALLBACK (on_modified_checkbox_toggled), self); } } @@ -247,12 +257,40 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog * return caption; } +static void +on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data) +{ + gchar *tmp, *msg; + + tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH); + msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp); + + show_error (GTK_WIDGET (self), msg); + + g_free (msg); + g_free (tmp); +} + +static void +on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data) +{ + gchar *tmp, *msg; + + tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH); + msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp); + + show_error (GTK_WIDGET (self), msg); + + g_free (msg); + g_free (tmp); +} + 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")); + /* ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */ + show_error (GTK_WIDGET (self), _CS("ckdg_ib_maximum_characters_reached")); } static GtkWidget* @@ -288,8 +326,7 @@ 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, "?"); - 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, "|"); @@ -297,6 +334,8 @@ create_page_account_details (ModestAccountSettingsDialog *self) modest_validating_entry_set_unallowed_characters ( MODEST_VALIDATING_ENTRY (self->entry_account_title), list_prevent); g_list_free (list_prevent); + modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_account_title), + on_entry_invalid_account_title_character, self); /* Set max length as in the UI spec: * The UI spec seems to want us to show a dialog if we hit the maximum. */ @@ -340,6 +379,31 @@ create_page_account_details (ModestAccountSettingsDialog *self) return GTK_WIDGET (box); } +static gchar* +get_entered_account_title (ModestAccountSettingsDialog *dialog) +{ + const gchar* account_title = + gtk_entry_get_text (GTK_ENTRY (dialog->entry_account_title)); + if (!account_title || (strlen (account_title) == 0)) + return NULL; + else { + /* Strip it of whitespace at the start and end: */ + gchar *result = g_strdup (account_title); + result = g_strstrip (result); + + if (!result) + return NULL; + + if (strlen (result) == 0) { + g_free (result); + return NULL; + } + + return result; + } +} + + static void on_button_signature (GtkButton *button, gpointer user_data) { @@ -352,10 +416,12 @@ on_button_signature (GtkButton *button, gpointer user_data) 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)); + gchar* account_title = get_entered_account_title (self); modest_signature_editor_dialog_set_settings ( MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog), use_signature, signature, account_title); + g_free (account_title); + account_title = NULL; g_free (signature); signature = NULL; } @@ -380,14 +446,19 @@ static GtkWidget* create_page_user_details (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + 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 name widgets: */ 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: @@ -401,7 +472,8 @@ create_page_user_details (ModestAccountSettingsDialog *self) 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, * as required by our UI specification: */ GList *list_prevent = NULL; @@ -410,6 +482,8 @@ create_page_user_details (ModestAccountSettingsDialog *self) modest_validating_entry_set_unallowed_characters ( MODEST_VALIDATING_ENTRY (self->entry_user_name), list_prevent); g_list_free (list_prevent); + modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_user_name), + on_entry_invalid_fullname_character, self); /* The username widgets: */ self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ()); @@ -479,8 +553,13 @@ create_page_user_details (ModestAccountSettingsDialog *self) G_CALLBACK (on_button_signature), self); gtk_widget_show (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 (box); + return GTK_WIDGET (scrollwin); } /** Change the caption title for the incoming server, @@ -563,9 +642,8 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *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 (hildon_number_editor_new (0, 65535)); + self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), self->entry_incoming_port, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->entry_incoming_port); @@ -677,6 +755,13 @@ on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkAdjustment *focus_adjustment = NULL; + + /* Put it all in a scrolled window, so that all widgets can be + * accessed even when the on-screen keyboard is visible: */ + GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* 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. @@ -763,7 +848,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* The port widgets: */ if (!self->entry_outgoing_port) - self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); + self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), self->entry_outgoing_port, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (self->entry_outgoing_port); @@ -806,16 +891,55 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) G_CALLBACK (on_button_outgoing_smtp_servers), self); gtk_widget_show (GTK_WIDGET (box)); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box); + gtk_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 (box); + 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) { /* Check that the title is not already in use: */ - const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title)); - if ((!account_title) || (strlen(account_title) == 0)) + gchar* account_title = get_entered_account_title (self); + if (!account_title) return FALSE; /* Should be prevented already anyway. */ if (strcmp(account_title, self->original_account_title) != 0) { @@ -827,14 +951,19 @@ check_data (ModestAccountSettingsDialog *self) /* Warn the user via a dialog: */ hildon_banner_show_information(NULL, NULL, _("mail_ib_account_name_already_existing")); + g_free (account_title); return FALSE; } } + + g_free (account_title); + account_title = NULL; - /* Check that the email address is valud: */ + /* Check that the email address is valid: */ const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email)); - if ((!email_address) || (strlen(email_address) == 0)) + if ((!email_address) || (strlen(email_address) == 0)) { return FALSE; + } if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ @@ -847,9 +976,55 @@ check_data (ModestAccountSettingsDialog *self) return FALSE; } - /* Find a suitable authentication method when secure authentication is desired */ + /* make sure the domain name for the incoming server is valid */ const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver)); - gint port_num = hildon_number_editor_get_value ( + if ((!hostname) || (strlen(hostname) == 0)) { + return FALSE; + } + + 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: */ + gtk_widget_grab_focus (self->entry_incomingserver); + gtk_editable_select_region (GTK_EDITABLE (self->entry_incomingserver), 0, -1); + return FALSE; + } + + /* make sure the domain name for the outgoing server is valid */ + const gchar* hostname2 = gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver)); + if ((!hostname2) || (strlen(hostname2) == 0)) { + return FALSE; + } + + if (!modest_text_utils_validate_domain_name (hostname2)) { + /* Warn the user via a dialog: */ + /*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: */ + gtk_widget_grab_focus (self->entry_outgoingserver); + gtk_editable_select_region (GTK_EDITABLE (self->entry_outgoingserver), 0, -1); + 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 ( HILDON_NUMBER_EDITOR (self->entry_incoming_port)); const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username)); @@ -888,14 +1063,12 @@ 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) { - GtkWidget* error_dialog = gtk_message_dialog_new(GTK_WINDOW(self), - GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, (error != NULL) ? error->message : _("Server does not support secure authentication!")); - gtk_dialog_run(GTK_DIALOG(error_dialog)); - gtk_widget_destroy(error_dialog); + show_error (GTK_WIDGET (self), _("Could not discover supported secure authentication methods.")); } - if(error != NULL) g_error_free(error); + if(error != NULL) + g_error_free(error); + /* This is a nasty hack. jschmid. */ /* Don't let the dialog close */ /*g_signal_stop_emission_by_name (dialog, "response");*/ @@ -903,11 +1076,7 @@ check_data (ModestAccountSettingsDialog *self) } } } - - /* TODO: The UI Spec wants us to check that the servernames are valid, - * but does not specify how. - */ - + return TRUE; } /* @@ -922,12 +1091,6 @@ on_response (GtkDialog *wizard_dialog, gboolean prevent_response = FALSE; - /* Set modified flag when the port number changed */ - gint port_num = hildon_number_editor_get_value ( - HILDON_NUMBER_EDITOR (self->entry_incoming_port)); - if(ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self)->initial_port != port_num) - self->modified = TRUE; - /* Warn about unsaved changes: */ if (response_id == GTK_RESPONSE_CANCEL && self->modified) { GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), @@ -965,10 +1128,10 @@ on_response (GtkDialog *wizard_dialog, const gboolean enabled = modest_account_mgr_get_enabled (self->account_manager, self->account_name); if (enabled) - show_ok (GTK_WINDOW (self), _("mcen_ib_advsetup_settings_saved")); + show_error (NULL, _("mcen_ib_advsetup_settings_saved")); } else - show_error (GTK_WINDOW (self), _("mail_ib_setting_failed")); + show_error (NULL, _("mail_ib_setting_failed")); } } } @@ -978,7 +1141,7 @@ 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()); + self->notebook = GTK_NOTEBOOK (gtk_notebook_new()); /* Get the account manager object, * so we can check for existing accounts, @@ -997,19 +1160,19 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) self->page_outgoing = create_page_outgoing (self); /* Add the notebook pages: */ - gtk_notebook_append_page (notebook, self->page_account_details, + gtk_notebook_append_page (self->notebook, self->page_account_details, gtk_label_new (_("mcen_ti_account_settings_account"))); - gtk_notebook_append_page (notebook, self->page_user_details, + gtk_notebook_append_page (self->notebook, self->page_user_details, gtk_label_new (_("mcen_ti_account_settings_userinfo"))); - gtk_notebook_append_page (notebook, self->page_incoming, + gtk_notebook_append_page (self->notebook, self->page_incoming, gtk_label_new (_("mcen_ti_advsetup_retrieval"))); - gtk_notebook_append_page (notebook, self->page_outgoing, + gtk_notebook_append_page (self->notebook, self->page_outgoing, gtk_label_new (_("mcen_ti_advsetup_sending"))); GtkDialog *dialog = GTK_DIALOG (self); - gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook)); + gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (self->notebook)); gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF); - gtk_widget_show (GTK_WIDGET (notebook)); + gtk_widget_show (GTK_WIDGET (self->notebook)); /* Add the buttons: */ gtk_dialog_add_button (GTK_DIALOG(self), GTK_STOCK_OK, GTK_RESPONSE_OK); @@ -1170,13 +1333,6 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo hildon_number_editor_set_value ( HILDON_NUMBER_EDITOR (dialog->entry_incoming_port), port_num); } - - /* HildonNumberEditor has no changed signal, so we do not get - * notified when the port number changes. Instead we check - * whether the number has changed before the dialog is closed. */ - ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(dialog)->initial_port = - hildon_number_editor_get_value ( - HILDON_NUMBER_EDITOR (dialog->entry_incoming_port)); } ModestServerAccountData *outgoing_account = account_data->transport_account; @@ -1223,7 +1379,7 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo } const gboolean has_specific = - modest_account_mgr_get_has_connection_specific_smtp ( + modest_account_mgr_get_use_connection_specific_smtp ( dialog->account_manager, account_name); gtk_toggle_button_set_active ( @@ -1256,6 +1412,24 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo dialog->modified = FALSE; } +/** Show the User Info tab. + */ +void modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog) +{ + const gint page_num = gtk_notebook_page_num (dialog->notebook, dialog->page_user_details); + if (page_num == -1) { + g_warning ("%s: notebook page not found.\n", __FUNCTION__); + } + + /* Ensure that the widget is visible so that gtk_notebook_set_current_page() works: */ + /* TODO: even this hack (recommened by the GTK+ documentation) doesn't seem to work. */ + + gtk_widget_show (dialog->page_user_details); + gtk_widget_show (GTK_WIDGET (dialog->notebook)); + gtk_widget_show (GTK_WIDGET (dialog)); + gtk_notebook_set_current_page (dialog->notebook, page_num); +} + static gboolean save_configuration (ModestAccountSettingsDialog *dialog) { @@ -1379,19 +1553,26 @@ save_configuration (ModestAccountSettingsDialog *dialog) /* Set the changed account title last, to simplify the previous code: */ - const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (dialog->entry_account_title)); - if ((!account_title) || (strlen(account_title) == 0)) + gchar* account_title = get_entered_account_title (dialog); + if (!account_title) return FALSE; /* Should be prevented already anyway. */ if (strcmp(account_title, account_name) != 0) { /* Change the title: */ - gboolean test = modest_account_mgr_set_string (dialog->account_manager, account_name, + 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) + if (!test) { + g_free (account_title); return FALSE; + } } + 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))); if (dialog->specific_window) { return modest_connection_specific_smtp_window_save_server_accounts ( MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name); @@ -1408,8 +1589,19 @@ static gboolean entry_is_empty (GtkWidget *entry) const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry)); if ((!text) || (strlen(text) == 0)) return TRUE; - else - return FALSE; + else { + /* Strip it of whitespace at the start and end: */ + gchar *stripped = g_strdup (text); + stripped = g_strstrip (stripped); + + if (!stripped) + return TRUE; + + const gboolean result = (strlen (stripped) == 0); + + g_free (stripped); + return result; + } } static void @@ -1456,25 +1648,21 @@ modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *kla } static void -show_error (GtkWindow *parent_window, const gchar* text) +show_error (GtkWidget *parent_widget, 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 )); - */ + 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)); -} - -static void -show_ok (GtkWindow *parent_window, const gchar* text) -{ - /* Don't show a dialog but Banner (NB #59248) */ - hildon_banner_show_information(GTK_WIDGET( - gtk_widget_get_parent_window(GTK_WIDGET(parent_window))), NULL, text); +#endif }