X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Feasysetup%2Fmodest-easysetup-wizard.c;h=881e37679ce78facdafb0408068f833cbc987199;hp=6a32d551666071dc562e985da7f4f5530c104aba;hb=a9eaeebe014fc78e453b46935cf8cd4c80dd4273;hpb=539b930f20e94817cdbfdd76ae359e0f1f30533e diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c index 6a32d55..881e376 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard.c +++ b/src/maemo/easysetup/modest-easysetup-wizard.c @@ -26,7 +26,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + #include "modest-easysetup-wizard.h" #include @@ -52,6 +52,7 @@ #include "maemo/modest-connection-specific-smtp-window.h" #include "widgets/modest-ui-constants.h" #include "maemo/modest-account-settings-dialog.h" +#include "maemo/modest-maemo-utils.h" #include #include /* For strlen(). */ @@ -69,12 +70,32 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate; +typedef enum { + MODEST_EASYSETUP_WIZARD_DIALOG_INCOMING_CHANGED = 0x01, + MODEST_EASYSETUP_WIZARD_DIALOG_OUTGOING_CHANGED = 0x02 +} ModestEasysetupWizardDialogServerChanges; + struct _ModestEasysetupWizardDialogPrivate { ModestPresets *presets; + + /* Remember what fields the user edited manually to not prefill them + * again. */ + ModestEasysetupWizardDialogServerChanges server_changes; + + /* Check if the user changes a field to show a confirmation dialog */ + gboolean dirty; }; static void +on_easysetup_changed(GtkWidget* widget, ModestEasysetupWizardDialog* wizard) +{ + ModestEasysetupWizardDialogPrivate* priv = WIZARD_DIALOG_GET_PRIVATE(wizard); + g_return_if_fail (priv != NULL); + priv->dirty = TRUE; +} + +static void modest_easysetup_wizard_dialog_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { @@ -135,6 +156,63 @@ set_default_custom_servernames(ModestEasysetupWizardDialog *dialog); static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data); +static gint get_serverport_incoming(ModestPresetsServerType servertype_incoming, + ModestPresetsSecurity security_incoming) +{ + int serverport_incoming = 0; + /* We don't check for SMTP here as that is impossible for an incoming server. */ + if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_IMAP) { + serverport_incoming = + (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 993 : 143; + } else if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_POP) { + serverport_incoming = + (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 995 : 110; + } + return serverport_incoming; +} + +static GList* check_for_supported_auth_methods(ModestEasysetupWizardDialog* account_wizard) +{ + GError *error = NULL; + const ModestTransportStoreProtocol protocol = + easysetup_servertype_combo_box_get_active_servertype ( + EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype)); + const gchar* hostname = gtk_entry_get_text(GTK_ENTRY(account_wizard->entry_incomingserver)); + const gchar* username = gtk_entry_get_text(GTK_ENTRY(account_wizard->entry_user_username)); + const ModestConnectionProtocol protocol_security_incoming = + modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX ( + account_wizard->combo_incoming_security)); + int port_num = get_serverport_incoming(protocol, protocol_security_incoming); + GList *list_auth_methods = + modest_maemo_utils_get_supported_secure_authentication_methods ( + protocol, + hostname, port_num, username, GTK_WINDOW (account_wizard), &error); + if (list_auth_methods) { + /* TODO: Select the correct method */ + GList* list = NULL; + GList* method; + for (method = list_auth_methods; method != NULL; method = g_list_next(method)) { + ModestAuthProtocol auth = (ModestAuthProtocol) (GPOINTER_TO_INT(method->data)); + if (modest_protocol_info_auth_is_secure(auth)) { + list = g_list_append(list, GINT_TO_POINTER(auth)); + } + } + g_list_free(list_auth_methods); + if (list) + return list; + } + + 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_WINDOW (account_wizard), _("Could not discover supported secure authentication methods.")); + } + + if(error != NULL) g_error_free(error); + return NULL; +} + static void invoke_enable_buttons_vfunc (ModestEasysetupWizardDialog *wizard_dialog) { @@ -232,11 +310,13 @@ on_combo_account_country (GtkComboBox *widget, gpointer user_data) g_assert(self); ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); + priv->dirty = TRUE; + /* Fill the providers combo, based on the selected country: */ - gint mcc_id = easysetup_country_combo_box_get_active_country_id ( + GSList *list_mcc_ids = easysetup_country_combo_box_get_active_country_ids ( EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country)); easysetup_provider_combo_box_fill ( - EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, mcc_id); + EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, list_mcc_ids); } static void @@ -246,6 +326,8 @@ on_combo_account_serviceprovider (GtkComboBox *widget, gpointer user_data) g_assert(self); ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); + priv->dirty = TRUE; + /* Fill the providers combo, based on the selected country: */ gchar* provider_id = easysetup_provider_combo_box_get_active_provider_id ( EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider)); @@ -269,7 +351,18 @@ static void on_entry_max (ModestValidatingEntry *self, gpointer user_data) { ModestEasysetupWizardDialog *dialog = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); - show_error (GTK_WINDOW (dialog), _("ckdg_ib_maximum_characters_reached")); + show_error (GTK_WINDOW (dialog), _CS("ckdg_ib_maximum_characters_reached")); +} + +static void +on_entry_invalid_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data) +{ + ModestEasysetupWizardDialog *dialog = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); + /* We could add a special case for whitespace here + if (character == NULL) ... + */ + hildon_banner_show_information ( + GTK_WIDGET(dialog), NULL, _("ckdg_ib_illegal_characters_entered")); } static GtkWidget* @@ -356,6 +449,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self) /* The description widgets: */ self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); + g_signal_connect(G_OBJECT(self->entry_account_title), "changed", + G_CALLBACK(on_easysetup_changed), self); /* 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); @@ -395,6 +490,8 @@ create_page_account_details (ModestEasysetupWizardDialog *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_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. */ @@ -428,6 +525,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) on_entry_max, self); GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL); + g_signal_connect(G_OBJECT(self->entry_user_name), "changed", + G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (self->entry_user_name); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -439,6 +538,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) list_prevent = g_list_append (list_prevent, ">"); modest_validating_entry_set_unallowed_characters ( MODEST_VALIDATING_ENTRY (self->entry_user_name), list_prevent); + modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_account_title), + on_entry_invalid_character, self); g_list_free (list_prevent); /* The username widgets: */ @@ -449,12 +550,16 @@ create_page_user_details (ModestEasysetupWizardDialog *self) 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, MODEST_MARGIN_HALF); + g_signal_connect(G_OBJECT(self->entry_user_username), "changed", + G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (caption); /* Prevent the use of some characters in the username, * as required by our UI specification: */ modest_validating_entry_set_unallowed_characters_whitespace ( MODEST_VALIDATING_ENTRY (self->entry_user_username)); + modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_account_title), + on_entry_invalid_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. */ @@ -471,6 +576,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */ caption = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL); + g_signal_connect(G_OBJECT(self->entry_user_password), "changed", + G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (self->entry_user_password); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -484,6 +591,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) 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, MODEST_MARGIN_HALF); + g_signal_connect(G_OBJECT(self->entry_user_email), "changed", + G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (caption); /* Set max length as in the UI spec: @@ -512,6 +621,12 @@ static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *s label = gtk_label_new (_("mcen_ia_easysetup_complete")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 40); + + /* The documentation for gtk_label_set_line_wrap() says that we must + * call gtk_widget_set_size_request() with a hard-coded width, + * though I wonder why gtk_label_set_max_width_chars() isn't enough. */ + gtk_widget_set_size_request (label, 400, -1); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -558,10 +673,24 @@ static void update_incoming_server_security_choices (ModestEasysetupWizardDialog static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_data) { ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE(self); + + priv->dirty = TRUE; + update_incoming_server_title (self); update_incoming_server_security_choices (self); + + set_default_custom_servernames (self); } - + +static void on_entry_incoming_servername_changed(GtkEntry *entry, gpointer user_data) +{ + ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); + priv->dirty = TRUE; + priv->server_changes |= MODEST_EASYSETUP_WIZARD_DIALOG_INCOMING_CHANGED; +} + static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); @@ -570,7 +699,7 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self GtkWidget *label = gtk_label_new (_("mcen_ia_emailsetup_account_type")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 40); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); /* Create a size group to be used by all captions. @@ -590,7 +719,11 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self gtk_widget_show (caption); if(!self->entry_incomingserver) + { self->entry_incomingserver = gtk_entry_new (); + g_signal_connect(G_OBJECT(self->entry_incomingserver), "changed", + G_CALLBACK(on_easysetup_changed), self); + } /* 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); set_default_custom_servernames (self); @@ -612,7 +745,11 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self * as in the UI spec: */ g_signal_connect (G_OBJECT (self->combo_incoming_servertype), "changed", G_CALLBACK (on_combo_servertype_changed), self); - + + /* Remember when the servername was changed manually: */ + g_signal_connect (G_OBJECT (self->entry_incomingserver), "changed", + G_CALLBACK (on_entry_incoming_servername_changed), self); + /* The secure connection widgets: */ if (!self->combo_incoming_security) self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); @@ -621,14 +758,21 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), MODEST_PROTOCOL_CONNECTION_NORMAL); caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL); + g_signal_connect (G_OBJECT (self->combo_incoming_security), "changed", + G_CALLBACK (on_easysetup_changed), self); gtk_widget_show (self->combo_incoming_security); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); if(!self->checkbox_incoming_auth) + { self->checkbox_incoming_auth = gtk_check_button_new (); + g_signal_connect (G_OBJECT (self->checkbox_incoming_auth), "toggled", + G_CALLBACK (on_easysetup_changed), self); + } 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); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -664,6 +808,11 @@ static void on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) { ModestEasysetupWizardDialog * self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); + ModestEasysetupWizardDialogPrivate* priv = WIZARD_DIALOG_GET_PRIVATE(self); + + /* We set dirty here because setting it depending on the connection specific dialog + seems overkill */ + priv->dirty = TRUE; /* Create the window, if necessary: */ if (!(self->specific_window)) { @@ -678,6 +827,13 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) gtk_widget_show (self->specific_window); } +static void on_entry_outgoing_servername_changed (GtkEntry *entry, gpointer user_data) +{ + ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); + priv->server_changes |= MODEST_EASYSETUP_WIZARD_DIALOG_OUTGOING_CHANGED; +} + static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); @@ -689,7 +845,11 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self /* The outgoing server widgets: */ if (!self->entry_outgoingserver) + { self->entry_outgoingserver = gtk_entry_new (); + g_signal_connect (G_OBJECT (self->entry_outgoingserver), "changed", + G_CALLBACK (on_easysetup_changed), self); + } /* 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_asterisk (self, sizegroup, @@ -701,7 +861,11 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self /* The secure connection widgets: */ if (!self->combo_outgoing_security) + { self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); + g_signal_connect (G_OBJECT (self->combo_outgoing_security), "changed", + G_CALLBACK (on_easysetup_changed), self); + } modest_serversecurity_combo_box_fill ( MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP); modest_serversecurity_combo_box_set_active_serversecurity ( @@ -714,7 +878,11 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self /* The secure authentication widgets: */ if (!self->combo_outgoing_auth) + { self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ()); + g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", + G_CALLBACK (on_easysetup_changed), self); + } 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); @@ -730,6 +898,9 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self self->checkbox_outgoing_smtp_specific = gtk_check_button_new (); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), FALSE); + g_signal_connect (G_OBJECT (self->checkbox_outgoing_smtp_specific), "toggled", + G_CALLBACK (on_easysetup_changed), self); + } caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL); @@ -753,6 +924,9 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self g_signal_connect (G_OBJECT (self->button_outgoing_smtp_servers), "clicked", G_CALLBACK (on_button_outgoing_smtp_servers), self); + + g_signal_connect (G_OBJECT (self->entry_outgoingserver), "changed", + G_CALLBACK (on_entry_outgoing_servername_changed), self); gtk_widget_show (GTK_WIDGET (box)); @@ -761,7 +935,7 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self } static gboolean -on_timeout_show_advanced_edit(gpointer user_data) +show_advanced_edit(gpointer user_data) { ModestEasysetupWizardDialog * self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); @@ -776,18 +950,7 @@ on_timeout_show_advanced_edit(gpointer user_data) gtk_dialog_run (GTK_DIALOG (dialog)); - /* TODO: The hide() is not necessary. - * It is just here to show that it doesn't work, - * just as destroy doesn't work. - */ - gtk_widget_hide (GTK_WIDGET(dialog)); - - /* TODO: The dialog remains on screen, not allowing any interaction. - * But gtk_widget_destroy() should always destroy. - */ - printf("debug: destroying settings dialog\n"); gtk_widget_destroy (GTK_WIDGET (dialog)); - printf("debug: after destroying settings dialog (doesn't seem to work).\n"); return FALSE; /* Do not call this timeout callback again. */ } @@ -802,10 +965,8 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data) * This account will be deleted if Finish is never actually clicked. */ gboolean saved = TRUE; - gboolean was_already_saved = TRUE; if (!(self->saved_account_name)) { saved = create_account (self, FALSE); - was_already_saved = FALSE; } if (!saved) @@ -815,17 +976,7 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data) return; /* Show the Account Settings window: */ - if (was_already_saved) { - /* Just show the dialog immediately: */ - on_timeout_show_advanced_edit(self); - } - else - { - printf ("debug: waiting for gconf to update its local cache. " - "This is a hack to work around a maemo gconf bug in maemo bora.\n"); - - g_timeout_add (5000, on_timeout_show_advanced_edit, self); - } + show_advanced_edit(self); } static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self) { @@ -865,18 +1016,46 @@ on_response (ModestWizardDialog *wizard_dialog, gpointer user_data) { ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (wizard_dialog); - if (response_id == GTK_RESPONSE_CANCEL) { /* Remove any temporarily-saved account that will not actually be needed: */ if (self->saved_account_name) { modest_account_mgr_remove_account (self->account_manager, self->saved_account_name, FALSE); - } + } } - + invoke_enable_buttons_vfunc (self); } +static void +on_response_before (ModestWizardDialog *wizard_dialog, + gint response_id, + gpointer user_data) +{ + ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (wizard_dialog); + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE(wizard_dialog); + if (response_id == GTK_RESPONSE_CANCEL) { + /* This is mostly copied from + * src/maemo/modest-account-settings-dialog.c */ + if (priv->dirty) + { + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), + _("imum_nc_wizard_confirm_lose_changes"))); + /* TODO: These button names will be ambiguous, and not specified in the UI specification. */ + + const gint dialog_response = gtk_dialog_run (dialog); + gtk_widget_destroy (GTK_WIDGET (dialog)); + + if (dialog_response != GTK_RESPONSE_OK) + { + /* This is a nasty hack. murrayc. */ + /* Don't let the dialog close */ + g_signal_stop_emission_by_name (wizard_dialog, "response"); + } + } + } +} + static void modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) { @@ -903,8 +1082,10 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) } g_assert(priv->presets); - - + + /* The server fields did not have been manually changed yet */ + priv->server_changes = 0; + /* Get the account manager object, * so we can check for existing accounts, * and create new accounts: */ @@ -947,7 +1128,14 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) */ g_signal_connect_after (G_OBJECT (self), "response", G_CALLBACK (on_response), self); - + + /* This is to show a confirmation dialog when the user hits cancel */ + g_signal_connect (G_OBJECT (self), "response", + G_CALLBACK (on_response_before), self); + + /* Reset dirty, because there was no user input until now */ + priv->dirty = 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 ( @@ -1087,21 +1275,27 @@ util_get_default_servername_from_email_address (const gchar* email_address, Mode static void set_default_custom_servernames (ModestEasysetupWizardDialog *account_wizard) { + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE(account_wizard); + if (!account_wizard->entry_incomingserver) return; /* Set a default domain for the server, based on the email address, * if no server name was already specified. */ - const gchar* incoming_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_incomingserver)); - if ((!incoming_existing || (strlen(incoming_existing) == 0)) - && account_wizard->entry_user_email) { + if (account_wizard->entry_user_email + && ((priv->server_changes & MODEST_EASYSETUP_WIZARD_DIALOG_INCOMING_CHANGED) == 0)) { const ModestTransportStoreProtocol protocol = easysetup_servertype_combo_box_get_active_servertype ( EASYSETUP_SERVERTYPE_COMBO_BOX (account_wizard->combo_incoming_servertype)); const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email)); gchar* servername = util_get_default_servername_from_email_address (email_address, protocol); + + /* Do not set the INCOMING_CHANGED flag because of this edit */ + g_signal_handlers_block_by_func (G_OBJECT (account_wizard->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), account_wizard); gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_incomingserver), servername); + g_signal_handlers_unblock_by_func (G_OBJECT (account_wizard->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), account_wizard); + g_free (servername); } @@ -1111,13 +1305,17 @@ static void set_default_custom_servernames (ModestEasysetupWizardDialog *account if (!account_wizard->entry_outgoingserver) return; - const gchar* outgoing_existing = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_outgoingserver)); - if ((!outgoing_existing || (strlen(outgoing_existing) == 0)) - && account_wizard->entry_user_email) { + if (account_wizard->entry_user_email + && ((priv->server_changes & MODEST_EASYSETUP_WIZARD_DIALOG_OUTGOING_CHANGED) == 0)) { const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(account_wizard->entry_user_email)); gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOL_TRANSPORT_SMTP); + + /* Do not set the OUTGOING_CHANGED flag because of this edit */ + g_signal_handlers_block_by_func (G_OBJECT (account_wizard->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), account_wizard); gtk_entry_set_text (GTK_ENTRY (account_wizard->entry_outgoingserver), servername); + g_signal_handlers_unblock_by_func (G_OBJECT (account_wizard->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), account_wizard); + g_free (servername); } } @@ -1143,7 +1341,7 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget * if (name_in_use) { /* Warn the user via a dialog: */ - show_error (GTK_WINDOW (account_wizard), _("mail_ib_account_name_already_existing")); + hildon_banner_show_information(NULL, NULL, _("mail_ib_account_name_already_existing")); return FALSE; } @@ -1154,13 +1352,14 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget * if ((!email_address) || (strlen(email_address) == 0)) return FALSE; - if (!modest_text_utils_validate_email_address (email_address)) { + if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ - show_error (GTK_WINDOW (account_wizard), _("mcen_ib_invalid_email")); + hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); /* Return focus to the email address entry: */ gtk_widget_grab_focus (account_wizard->entry_user_email); - + gtk_editable_select_region (GTK_EDITABLE (account_wizard->entry_user_email), 0, -1); + return FALSE; } @@ -1177,6 +1376,23 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget * } else if (next_page == account_wizard->page_custom_outgoing) { set_default_custom_servernames (account_wizard); + /* Check if the server supports secure authentication */ + const ModestConnectionProtocol security_incoming = + modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX ( + account_wizard->combo_incoming_security)); + if (gtk_toggle_button_get_active ( + GTK_TOGGLE_BUTTON (account_wizard->checkbox_incoming_auth)) + && !modest_protocol_info_is_secure(security_incoming)) + { + GList* methods = check_for_supported_auth_methods(account_wizard); + if (!methods) + { + g_list_free(methods); + return FALSE; + } + g_list_free(methods); + } } /* If this is the last page, and this is a click on Finish, @@ -1334,7 +1550,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) /* username and password (for both incoming and outgoing): */ const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username)); const gchar* password = gtk_entry_get_text (GTK_ENTRY (self->entry_user_password)); - /* Incoming server: */ /* Note: We need something as default for the ModestTransportStoreProtocol* values, * or modest_account_mgr_add_server_account will fail. */ @@ -1343,7 +1558,7 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) ModestTransportStoreProtocol protocol_incoming = MODEST_PROTOCOL_STORE_POP; ModestConnectionProtocol protocol_security_incoming = MODEST_PROTOCOL_CONNECTION_NORMAL; ModestAuthProtocol protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_NONE; - + /* Get details from the specified presets: */ gchar* provider_id = easysetup_provider_combo_box_get_active_provider_id ( EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider)); @@ -1360,18 +1575,15 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) TRUE /* incoming */); g_warning ("security incoming: %x", security_incoming); - + /* We don't check for SMTP here as that is impossible for an incoming server. */ if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_IMAP) { protocol_incoming = MODEST_PROTOCOL_STORE_IMAP; - serverport_incoming = - (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 993 : 143; } else if (servertype_incoming == MODEST_PRESETS_SERVER_TYPE_POP) { - protocol_incoming = MODEST_PROTOCOL_STORE_POP; - serverport_incoming = - (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING_ALTERNATE_PORT) ? 995 : 110; + protocol_incoming = MODEST_PROTOCOL_STORE_POP; } - + serverport_incoming = get_serverport_incoming(servertype_incoming, security_incoming); + if (security_incoming & MODEST_PRESETS_SECURITY_SECURE_INCOMING) protocol_security_incoming = MODEST_PROTOCOL_CONNECTION_SSL; /* TODO: Is this what we want? */ @@ -1391,11 +1603,19 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) /* The UI spec says: * If secure authentication is unchecked, allow sending username and password also as plain text. * If secure authentication is checked, require one of the secure methods during connection: SSL, TLS, CRAM-MD5 etc. - * TODO: Do we need to discover which of these (SSL, TLS, CRAM-MD5) is supported? */ - protocol_authentication_incoming = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) - ? MODEST_PROTOCOL_AUTH_CRAMMD5 - : MODEST_PROTOCOL_AUTH_PASSWORD; + + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->checkbox_incoming_auth)) && + !modest_protocol_info_is_secure(protocol_security_incoming)) + { + GList* methods = check_for_supported_auth_methods(self); + if (!methods) + return FALSE; + else + protocol_authentication_incoming = (ModestAuthProtocol) (GPOINTER_TO_INT(methods->data)); + } + else + protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_PASSWORD; } /* First we add the 2 server accounts, and then we add the account that uses them. @@ -1423,18 +1643,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) return FALSE; } - /* Sanity check: */ - /* There must be at least one account now: */ - /* Note, when this fails is is caused by a Maemo gconf bug that has been - * fixed in versions after 3.1. */ - GSList *account_names = modest_account_mgr_account_names (self->account_manager, FALSE); - if(!account_names) - { - g_warning ("modest_account_mgr_account_names() returned NULL after adding an account."); - } - g_slist_free (account_names); - - /* Outgoing server: */ gchar* servername_outgoing = NULL; ModestTransportStoreProtocol protocol_outgoing = MODEST_PROTOCOL_STORE_POP; @@ -1459,15 +1667,19 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) ModestPresetsSecurity security_outgoing = modest_presets_get_info_server_security (priv->presets, provider_id, FALSE /* incoming */); - + + /* TODO: There is no SMTP authentication enum for presets, + so we should probably check what the server supports. */ protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_NORMAL; if (security_outgoing & MODEST_PRESETS_SECURITY_SECURE_SMTP) { + /* printf("DEBUG: %s: using secure SMTP\n", __FUNCTION__); */ protocol_security_outgoing = MODEST_PROTOCOL_CONNECTION_SSL; /* TODO: Is this what we want? */ serverport_outgoing = 465; protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_PASSWORD; - } else + } else { + /* printf("DEBUG: %s: using non-secure SMTP\n", __FUNCTION__); */ protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE; - /* TODO: There is no SMTP authentication enum for presets. */ + } } else { /* Use custom pages because no preset was specified: */ @@ -1518,7 +1730,14 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) show_error (GTK_WINDOW (self), _("An error occurred while creating the account.")); return FALSE; } - + + /* Sanity check: */ + /* There must be at least one account now: */ + /* Note, when this fails is is caused by a Maemo gconf bug that has been + * fixed in versions after 3.1. */ + if(!modest_account_mgr_has_accounts (self->account_manager, FALSE)) + g_warning ("modest_account_mgr_account_names() returned NULL after adding an account."); + /* The user name and email address must be set additionally: */ const gchar* user_name = gtk_entry_get_text (GTK_ENTRY (self->entry_user_name)); modest_account_mgr_set_string (self->account_manager, account_name,