X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Feasysetup%2Fmodest-easysetup-wizard.c;h=8e32cdab695349119bbe2bee6e0bb0feebb575c1;hp=216143939209519d63be51fdbbbc45de52b9bec0;hb=efe9e2c03a0931274191fcf7929c70cac4a6c07f;hpb=ac93729ec59e4b6ae2169ae3127d46057dfb9b12 diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c index 2161439..8e32cda 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard.c +++ b/src/maemo/easysetup/modest-easysetup-wizard.c @@ -70,6 +70,7 @@ 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 @@ -87,6 +88,15 @@ struct _ModestEasysetupWizardDialogPrivate gboolean dirty; }; +static gboolean +on_delete_event (GtkWidget *widget, + GdkEvent *event, + ModestEasysetupWizardDialog *wizard) +{ + gtk_dialog_response (GTK_DIALOG (wizard), GTK_RESPONSE_CANCEL); + return TRUE; +} + static void on_easysetup_changed(GtkWidget* widget, ModestEasysetupWizardDialog* wizard) { @@ -181,9 +191,9 @@ static GList* check_for_supported_auth_methods(ModestEasysetupWizardDialog* acco 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); + MODEST_SERVERSECURITY_COMBO_BOX ( + account_wizard->combo_incoming_security)); + const int port_num = get_serverport_incoming(protocol, protocol_security_incoming); GList *list_auth_methods = modest_maemo_utils_get_supported_secure_authentication_methods ( protocol, @@ -198,7 +208,9 @@ static GList* check_for_supported_auth_methods(ModestEasysetupWizardDialog* acco list = g_list_append(list, GINT_TO_POINTER(auth)); } } + g_list_free(list_auth_methods); + if (list) return list; } @@ -209,10 +221,39 @@ static GList* check_for_supported_auth_methods(ModestEasysetupWizardDialog* acco show_error (GTK_WIDGET(account_wizard), _("Could not discover supported secure authentication methods.")); } - if(error != NULL) g_error_free(error); + if(error != NULL) + g_error_free(error); + return NULL; } +static gboolean check_has_supported_auth_methods(ModestEasysetupWizardDialog* account_wizard) +{ + GList* methods = check_for_supported_auth_methods(account_wizard); + if (!methods) + { + return FALSE; + } + + g_list_free(methods); + return TRUE; +} + +static ModestAuthProtocol check_first_supported_auth_method(ModestEasysetupWizardDialog* account_wizard) +{ + ModestAuthProtocol result = MODEST_PROTOCOL_AUTH_PASSWORD; + + GList* methods = check_for_supported_auth_methods(account_wizard); + if (methods) + { + /* Use the first one: */ + result = (ModestAuthProtocol) (GPOINTER_TO_INT(methods->data)); + g_list_free(methods); + } + + return result; +} + static void invoke_enable_buttons_vfunc (ModestEasysetupWizardDialog *wizard_dialog) { @@ -296,7 +337,7 @@ create_page_welcome (ModestEasysetupWizardDialog *self) GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); /* So that it is not truncated: */ - gtk_label_set_max_width_chars (GTK_LABEL (label), 40); + gtk_widget_set_size_request (label, 600, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); gtk_widget_show (GTK_WIDGET (box)); @@ -313,10 +354,12 @@ on_combo_account_country (GtkComboBox *widget, gpointer user_data) priv->dirty = TRUE; /* Fill the providers combo, based on the selected country: */ - 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, list_mcc_ids); + if (priv->presets != NULL) { + gint mcc = easysetup_country_combo_box_get_active_country_mcc ( + EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country)); + easysetup_provider_combo_box_fill ( + EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), priv->presets, mcc); + } } static void @@ -358,11 +401,17 @@ 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) ... - */ + + const gchar *show_char = NULL; + if (character) + show_char = character; + else { + /* TODO: We need a logical ID for this: */ + show_char = _("whitespace"); + } + /* TODO: Should this show just this one bad character or all the not-allowed characters? */ - gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), character); + gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char); show_error (GTK_WIDGET (self), message); } @@ -372,7 +421,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_max_width_chars (GTK_LABEL (label), 40); + gtk_widget_set_size_request (label, 600, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (label); @@ -399,6 +448,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) /* The service provider widgets: */ self->combo_account_serviceprovider = GTK_WIDGET (easysetup_provider_combo_box_new ()); + gtk_widget_set_size_request (self->combo_account_serviceprovider, 320, -1); caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_serviceprovider"), self->combo_account_serviceprovider, NULL, HILDON_CAPTION_OPTIONAL); @@ -419,10 +469,9 @@ create_page_account_details (ModestEasysetupWizardDialog *self) * set by the osso-operator-wizard package, suggested by Dirk-Jan Binnema. * */ - GConfClient *client = gconf_client_get_default (); GError *error = NULL; const gchar* key = "/apps/osso/operator-wizard/last_mcc"; - gint mcc_id = gconf_client_get_int(client, key, &error); + gint mcc_id = modest_conf_get_int(modest_runtime_get_conf (), key, &error); if(mcc_id < 0) mcc_id = 0; @@ -435,7 +484,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) mcc_id = 0; } - /* Note that gconf_client_get_int() seems to return 0 without an error if the key is not there + /* Note that modest_conf_get_int() seems to return 0 without an error if the key is not there * This might just be a Maemo bug. */ if (mcc_id == 0) @@ -444,7 +493,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) mcc_id = 244; } - easysetup_country_combo_box_set_active_country_id ( + easysetup_country_combo_box_set_active_country_mcc ( EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country), mcc_id); @@ -516,10 +565,11 @@ create_page_user_details (ModestEasysetupWizardDialog *self) * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */ GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - /* The name widgets: */ + /* The name widgets: (use auto cap) */ 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); + hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_name), + HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); + /* Set max length as in the UI spec: * 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); @@ -541,7 +591,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) 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_user_name), - on_entry_invalid_character, self); + on_entry_invalid_character, self); g_list_free (list_prevent); /* The username widgets: */ @@ -561,7 +611,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) modest_validating_entry_set_unallowed_characters_whitespace ( MODEST_VALIDATING_ENTRY (self->entry_user_username)); modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_user_username), - on_entry_invalid_character, self); + 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. */ @@ -615,19 +665,17 @@ static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *s GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_max_width_chars (GTK_LABEL (label), 40); + gtk_widget_set_size_request (label, 600, -1); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + /* 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_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); 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_widget_set_size_request (label, 600, -1); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); @@ -696,11 +744,16 @@ static void on_entry_incoming_servername_changed(GtkEntry *entry, gpointer user_ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); /* Show note that account type cannot be changed in future: */ 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_widget_set_size_request (label, 600, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -780,8 +833,13 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self gtk_widget_show (caption); gtk_widget_show (GTK_WIDGET (box)); + + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); + gtk_widget_show (scrolled_window); - return GTK_WIDGET (box); + return GTK_WIDGET (scrolled_window); } static void @@ -820,12 +878,12 @@ 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, - NULL /* account_name, not known yet. */); + 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); } @@ -948,7 +1006,7 @@ show_advanced_edit(gpointer user_data) ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); modest_account_settings_dialog_set_account_name (dialog, self->saved_account_name); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -985,11 +1043,15 @@ static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_set_size_request (label, 600, -1); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); label = gtk_label_new (_("mcen_ia_customsetup_complete")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_set_size_request (label, 600, -1); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -1022,7 +1084,7 @@ on_response (ModestWizardDialog *wizard_dialog, /* 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); + self->saved_account_name); } } @@ -1039,18 +1101,17 @@ on_response_before (ModestWizardDialog *wizard_dialog, if (response_id == GTK_RESPONSE_CANCEL) { /* This is mostly copied from * src/maemo/modest-account-settings-dialog.c */ - if (priv->dirty) - { + 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. */ + /* TODO: These button names will be ambiguous, and not + * specified in the UI specification. */ const gint dialog_response = gtk_dialog_run (dialog); + self->combo_account_country = NULL; gtk_widget_destroy (GTK_WIDGET (dialog)); - if (dialog_response != GTK_RESPONSE_OK) - { - /* This is a nasty hack. murrayc. */ + if (dialog_response != GTK_RESPONSE_OK) { /* Don't let the dialog close */ g_signal_stop_emission_by_name (wizard_dialog, "response"); } @@ -1058,6 +1119,78 @@ on_response_before (ModestWizardDialog *wizard_dialog, } } +typedef struct IdleData { + ModestEasysetupWizardDialog *dialog; + ModestPresets *presets; +} IdleData; + +gboolean +presets_idle (gpointer userdata) +{ + IdleData *idle_data = (IdleData *) userdata; + ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (idle_data->dialog); + ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); + + g_assert (idle_data->presets); + + gdk_threads_enter (); + + priv->presets = idle_data->presets; + + if (self->combo_account_country) { + gint mcc = easysetup_country_combo_box_get_active_country_mcc ( + EASYSETUP_COUNTRY_COMBO_BOX (self->combo_account_country)); + easysetup_provider_combo_box_fill ( + EASYSETUP_PROVIDER_COMBO_BOX (self->combo_account_serviceprovider), + priv->presets, mcc); + } + + priv->dirty = FALSE; + + g_object_unref (idle_data->dialog); + g_free (idle_data); + + gdk_threads_leave (); + + return FALSE; +} + +gpointer +presets_loader (gpointer userdata) +{ + ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (userdata); + ModestPresets *presets = NULL; + IdleData *idle_data; + + const gchar* path = NULL; + const gchar* path1 = MODEST_PROVIDER_DATA_FILE; + const gchar* path2 = MODEST_MAEMO_PROVIDER_DATA_FILE; + + if (access(path1, R_OK) == 0) + path = path1; + else if (access(path2, R_OK) == 0) + path = path2; + else { + g_warning ("%s: neither '%s' nor '%s' is a readable provider data file", + __FUNCTION__, path1, path2); + return NULL; + } + + presets = modest_presets_new (path); + if (!presets) { + g_warning ("%s: failed to parse '%s'", __FUNCTION__, path); + return NULL; + } + + idle_data = g_new0 (IdleData, 1); + idle_data->dialog = self; + idle_data->presets = presets; + + g_idle_add (presets_idle, idle_data); + + return NULL; +} + static void modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) { @@ -1077,14 +1210,6 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) /* Read in the information about known service providers: */ ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); - const gchar* filepath = MODEST_PROVIDERS_DATA_PATH; /* Defined in config.h */ - priv->presets = modest_presets_new (filepath); - if (!(priv->presets)) { - g_warning ("Could not locate the official provider data keyfile from %s", filepath); - } - - g_assert(priv->presets); - /* The server fields did not have been manually changed yet */ priv->server_changes = 0; @@ -1104,10 +1229,27 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) /* Add the common pages: */ gtk_notebook_append_page (notebook, self->page_welcome, gtk_label_new (_("mcen_ti_emailsetup_welcome"))); + gtk_container_child_set (GTK_CONTAINER (notebook), + self->page_welcome, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); + gtk_notebook_append_page (notebook, self->page_account_details, gtk_label_new (_("mcen_ti_accountdetails"))); + gtk_container_child_set (GTK_CONTAINER (notebook), + self->page_account_details, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); + gtk_notebook_append_page (notebook, self->page_user_details, gtk_label_new (_("mcen_ti_emailsetup_userdetails"))); + gtk_container_child_set (GTK_CONTAINER (notebook), + self->page_user_details, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); /* Create and add the easysetup-specific pages, * because we need _some_ final page to enable the Next and Finish buttons: */ @@ -1135,6 +1277,9 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response_before), self); + g_signal_connect (G_OBJECT (self), "delete-event", + G_CALLBACK (on_delete_event), self); + /* Reset dirty, because there was no user input until now */ priv->dirty = FALSE; @@ -1142,11 +1287,19 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) * 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)); + + /* Load provider presets */ + g_object_ref (self); + g_thread_create (presets_loader, self, FALSE, NULL); + + hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_wizardwelcome", + modest_maemo_utils_get_osso_context()); } ModestEasysetupWizardDialog* modest_easysetup_wizard_dialog_new (void) -{ +{ + return g_object_new (MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, NULL); } @@ -1177,9 +1330,15 @@ static void create_subsequent_customsetup_pages (ModestEasysetupWizardDialog *se gtk_notebook_append_page (notebook, self->page_custom_outgoing, gtk_label_new (_("mcen_ti_emailsetup_outgoingdetails"))); - if (!gtk_widget_get_parent (GTK_WIDGET (self->page_complete_customsetup))) + if (!gtk_widget_get_parent (GTK_WIDGET (self->page_complete_customsetup))) { gtk_notebook_append_page (notebook, self->page_complete_customsetup, gtk_label_new (_("mcen_ti_emailsetup_complete"))); + gtk_container_child_set (GTK_CONTAINER (notebook), + self->page_complete_customsetup, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); + } /* This is unnecessary with GTK+ 2.10: */ modest_wizard_dialog_force_title_update (MODEST_WIZARD_DIALOG(self)); @@ -1195,9 +1354,15 @@ static void create_subsequent_easysetup_pages (ModestEasysetupWizardDialog *self if(!self->page_complete_easysetup) self->page_complete_easysetup = create_page_complete_easysetup (self); - if (!gtk_widget_get_parent (GTK_WIDGET (self->page_complete_easysetup))) + if (!gtk_widget_get_parent (GTK_WIDGET (self->page_complete_easysetup))) { gtk_notebook_append_page (notebook, self->page_complete_easysetup, gtk_label_new (_("mcen_ti_emailsetup_complete"))); + gtk_container_child_set (GTK_CONTAINER (notebook), + self->page_complete_easysetup, + "tab-expand", TRUE, + "tab-fill", TRUE, + NULL); + } /* This is unnecessary with GTK+ 2.10: */ modest_wizard_dialog_force_title_update (MODEST_WIZARD_DIALOG(self)); @@ -1322,6 +1487,30 @@ static void set_default_custom_servernames (ModestEasysetupWizardDialog *account } } +static gchar* +get_entered_account_title (ModestEasysetupWizardDialog *account_wizard) +{ + const gchar* account_title = + gtk_entry_get_text (GTK_ENTRY (account_wizard->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 gboolean on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *next_page) { @@ -1333,8 +1522,8 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget * */ if (current_page == account_wizard->page_account_details) { /* Check that the title is not already in use: */ - const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (account_wizard->entry_account_title)); - if ((!account_title) || (strlen(account_title) == 0)) + gchar* account_title = get_entered_account_title (account_wizard); + if (!account_title) return FALSE; /* Aavoid a clash with an existing display name: */ @@ -1378,7 +1567,8 @@ 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 */ + + /* Check if the server supports secure authentication */ const ModestConnectionProtocol security_incoming = modest_serversecurity_combo_box_get_active_serversecurity ( MODEST_SERVERSECURITY_COMBO_BOX ( @@ -1387,13 +1577,8 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget * 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); + if (!check_has_supported_auth_methods (account_wizard)) return FALSE; - } - g_list_free(methods); } } @@ -1424,8 +1609,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 @@ -1508,6 +1704,7 @@ modest_easysetup_wizard_dialog_class_init (ModestEasysetupWizardDialogClass *kla static void show_error (GtkWidget *parent_widget, const gchar* text) { + //TODO: Apparently this doesn't show anything in Maemo Bora: hildon_banner_show_information(parent_widget, NULL, text); #if 0 @@ -1528,12 +1725,12 @@ show_error (GtkWidget *parent_widget, const gchar* text) /** Attempt to create the account from the information that the user has entered. * @result: TRUE if the account was successfully created. */ -gboolean +static gboolean create_account (ModestEasysetupWizardDialog *self, gboolean enabled) { ModestEasysetupWizardDialogPrivate *priv = WIZARD_DIALOG_GET_PRIVATE (self); - - const gchar* display_name = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title)); + guint special_port; + gchar* display_name = get_entered_account_title (self); /* Some checks: */ if (!display_name) @@ -1543,8 +1740,10 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) * and changed that name accordingly, * but let's check again just in case: */ - if (modest_account_mgr_account_with_display_name_exists (self->account_manager, display_name)) + if (modest_account_mgr_account_with_display_name_exists (self->account_manager, display_name)) { + g_free (display_name); return FALSE; + } /* Increment the non-user visible name if necessary, * based on the display name: */ @@ -1580,7 +1779,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) provider_id, 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) { @@ -1612,16 +1810,12 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) */ 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)); + !modest_protocol_info_is_secure(protocol_security_incoming)) { + protocol_authentication_incoming = check_first_supported_auth_method (self); } - else + else { protocol_authentication_incoming = MODEST_PROTOCOL_AUTH_PASSWORD; + } } /* First we add the 2 server accounts, and then we add the account that uses them. @@ -1632,6 +1826,13 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) gchar *store_name = modest_account_mgr_get_unused_account_name (self->account_manager, store_name_start, TRUE /* server account */); g_free (store_name_start); + + /* we check if there is a *special* port */ + special_port = modest_presets_get_port (priv->presets, provider_id, + TRUE /* incoming */); + if (special_port != 0) + serverport_incoming = special_port; + gboolean created = modest_account_mgr_add_server_account (self->account_manager, store_name, servername_incoming, @@ -1646,6 +1847,7 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) if (!created) { /* TODO: Provide a Logical ID for the text: */ show_error (GTK_WIDGET (self), _("An error occurred while creating the incoming account.")); + g_free (display_name); return FALSE; } @@ -1674,8 +1876,6 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) 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__); */ @@ -1686,8 +1886,7 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) /* printf("DEBUG: %s: using non-secure SMTP\n", __FUNCTION__); */ protocol_authentication_outgoing = MODEST_PROTOCOL_AUTH_NONE; } - } - else { + } else { /* Use custom pages because no preset was specified: */ servername_outgoing = g_strdup (gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver) )); @@ -1705,6 +1904,13 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) gchar *transport_name = modest_account_mgr_get_unused_account_name (self->account_manager, transport_name_start, TRUE /* server account */); g_free (transport_name_start); + + /* we check if there is a *special* port */ + special_port = modest_presets_get_port (priv->presets, provider_id, + FALSE /* incoming */); + if (special_port != 0) + serverport_outgoing = special_port; + created = modest_account_mgr_add_server_account (self->account_manager, transport_name, servername_outgoing, @@ -1719,14 +1925,23 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) if (!created) { /* TODO: Provide a Logical ID for the text: */ show_error (GTK_WIDGET (self), _("An error occurred while creating the outgoing account.")); + g_free (display_name); return FALSE; } + const gchar* user_fullname = gtk_entry_get_text (GTK_ENTRY (self->entry_user_name)); + const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email)); + const gchar *retrieve = MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY; /* Create the account, which will contain the two "server accounts": */ - created = modest_account_mgr_add_account (self->account_manager, account_name, - store_name, /* The name of our POP/IMAP server account. */ - transport_name, /* The name of our SMTP server account. */ + created = modest_account_mgr_add_account (self->account_manager, + account_name, + display_name, + user_fullname, + emailaddress, + retrieve, + store_name, + transport_name, enabled); g_free (store_name); g_free (transport_name); @@ -1734,6 +1949,7 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) if (!created) { /* TODO: Provide a Logical ID for the text: */ show_error (GTK_WIDGET (self), _("An error occurred while creating the account.")); + g_free (display_name); return FALSE; } @@ -1744,34 +1960,20 @@ create_account (ModestEasysetupWizardDialog *self, gboolean enabled) 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, - MODEST_ACCOUNT_FULLNAME, user_name, FALSE /* not server account */); - - const gchar* emailaddress = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email)); - modest_account_mgr_set_string (self->account_manager, account_name, - MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */); - - /* Set the display name: */ - modest_account_mgr_set_string (self->account_manager, account_name, - MODEST_ACCOUNT_DISPLAY_NAME, display_name, FALSE /* not server account */); - - /* Set retrieve type */ - const gchar *retrieve = MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY; - modest_account_mgr_set_string (self->account_manager, account_name, - MODEST_ACCOUNT_RETRIEVE, retrieve, FALSE /* not server account */); - /* Save the connection-specific SMTP server accounts. */ + modest_account_mgr_set_use_connection_specific_smtp(self->account_manager, account_name, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->checkbox_outgoing_smtp_specific))); gboolean result = TRUE; if (self->specific_window) result = modest_connection_specific_smtp_window_save_server_accounts ( - MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), account_name); + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window)); + g_free (self->saved_account_name); self->saved_account_name = g_strdup (account_name); g_free (account_name); - + g_free (display_name); + return result; }