X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-easysetup-wizard-dialog.c;h=d32e8ed6d5615f07ca5efa93aaaf2e2c5a6c3d19;hb=5f5d20e1973b4928bc70504174de6edd15f59758;hp=68ec5586a36468c7abfde69e1c253e73192fa85a;hpb=63eedb5569e6bbed4df2e871d7397bb6a974aa43;p=modest diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 68ec558..d32e8ed 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -59,6 +59,7 @@ #include "modest-hildon-includes.h" #include "modest-maemo-security-options-view.h" #include "modest-account-protocol.h" +#include "modest-address-book.h" /* Include config.h so that _() works: */ #ifdef HAVE_CONFIG_H @@ -71,7 +72,7 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \ ModestEasysetupWizardDialogPrivate)) -#define LABELS_WIDTH 480 +#define LABELS_WIDTH 520 #define DIALOG_WIDTH LABELS_WIDTH + MODEST_MARGIN_DOUBLE typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate; @@ -103,10 +104,8 @@ struct _ModestEasysetupWizardDialogPrivate /* notebook pages: */ GtkWidget *page_welcome; - GtkWidget *check_support_progress; gboolean check_support_done; guint check_support_show_progress_id; - guint check_support_progress_pulse_id; gint pending_check_support; gboolean destroyed; @@ -155,7 +154,6 @@ static void check_support_callback (ModestAccountProtocol *protocol, gpointer userdata); static void check_support_of_protocols (ModestEasysetupWizardDialog *self); static gboolean check_support_show_progress (gpointer userdata); -static gboolean check_support_progress_pulse (gpointer userdata); static gboolean on_delete_event (GtkWidget *widget, @@ -185,11 +183,6 @@ modest_easysetup_wizard_dialog_dispose (GObject *object) priv->check_support_show_progress_id = 0; } - if (priv->check_support_progress_pulse_id > 0) { - g_source_remove (priv->check_support_progress_pulse_id); - priv->check_support_progress_pulse_id = 0; - } - if (G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose) G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose (object); } @@ -368,8 +361,9 @@ create_captioned (ModestEasysetupWizardDialog *self, { GtkWidget *result; - result = modest_maemo_utils_create_captioned (title_size_group, value_size_group, - value, use_markup, control); + result = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group, + value, use_markup, control, + MODEST_EDITABLE_SIZE); /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -398,7 +392,6 @@ create_page_welcome (ModestEasysetupWizardDialog *self) priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); label = gtk_label_new(_("mcen_ia_emailsetup_intro")); - priv->check_support_progress = gtk_progress_bar_new (); align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0); gtk_widget_set_size_request (label, LABELS_WIDTH, -1); @@ -407,7 +400,6 @@ create_page_welcome (ModestEasysetupWizardDialog *self) gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (box), priv->check_support_progress, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER (align), box); gtk_widget_show (label); gtk_widget_show (GTK_WIDGET (box)); @@ -415,7 +407,7 @@ create_page_welcome (ModestEasysetupWizardDialog *self) } static void -on_account_country_selector_changed (HildonTouchSelector *widget, gint column, gpointer user_data) +on_account_country_selector_changed (HildonTouchSelector *widget, gpointer user_data) { ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); g_assert(self); @@ -524,8 +516,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) /* The description widgets: */ priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); - g_signal_connect(G_OBJECT(priv->entry_account_title), "changed", - G_CALLBACK(on_easysetup_changed), self); + /* Do use auto-capitalization: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_account_title), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); @@ -542,6 +533,10 @@ create_page_account_details (ModestEasysetupWizardDialog *self) g_free (default_account_name); default_account_name = NULL; + /* Connect signal after changing the text in the entry */ + g_signal_connect(G_OBJECT(priv->entry_account_title), "changed", + G_CALLBACK(on_easysetup_changed), self); + priv->caption_account_title = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"), FALSE, priv->entry_account_title); @@ -590,6 +585,46 @@ create_page_account_details (ModestEasysetupWizardDialog *self) return GTK_WIDGET (align); } +static void +on_user_username_changed(GtkWidget* widget, ModestEasysetupWizardDialog *self) +{ + ModestEasysetupWizardDialogPrivate* priv; + gchar* provider_id = NULL; + + priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); + + /* Work out the user email address */ + provider_id = modest_provider_picker_get_active_provider_id ( + MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker)); + + if (provider_id) { + const gchar *current_username; + gchar *email_address; + gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id); + + current_username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)); + + if (current_username && strstr (current_username, "@")) { + email_address = g_strdup (current_username); + } else { + email_address = g_strdup_printf ("%s@%s", + current_username, + domain_name); + } + + /* Update the email address */ + hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address); + + g_free (email_address); + g_free (domain_name); + g_free (provider_id); + } + + /* Update state */ + on_easysetup_changed(widget, self); +} + + static GtkWidget* create_page_user_details (ModestEasysetupWizardDialog *self) { @@ -598,6 +633,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) GtkWidget *box; ModestEasysetupWizardDialogPrivate *priv; GtkWidget *align; + const gchar *my_name; priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self); @@ -620,6 +656,12 @@ create_page_user_details (ModestEasysetupWizardDialog *self) on_entry_max, self); GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name); + + /* Try to initialize the user name with my own contact */ + my_name = modest_address_book_get_my_name (); + if (my_name) + gtk_entry_set_text (GTK_ENTRY (priv->entry_user_name), my_name); + g_signal_connect(G_OBJECT(priv->entry_user_name), "changed", G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (priv->entry_user_name); @@ -647,7 +689,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) gtk_widget_show (priv->entry_user_username); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", - G_CALLBACK(on_easysetup_changed), self); + G_CALLBACK(on_user_username_changed), self); gtk_widget_show (caption); /* Prevent the use of some characters in the username, @@ -804,8 +846,6 @@ on_servertype_selector_changed(HildonTouchSelector *selector, gint column, gpoin { ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self); - ModestServertypePicker *picker; - ModestProtocolType protocol_type; priv->dirty = TRUE; @@ -813,8 +853,6 @@ on_servertype_selector_changed(HildonTouchSelector *selector, gint column, gpoin update_incoming_server_title (self); /* Update security options if needed */ - picker = MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker); - protocol_type = modest_servertype_picker_get_active_servertype (picker); update_incoming_server_security_choices (self); gtk_widget_show (priv->incoming_security); @@ -876,7 +914,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) gtk_widget_show (priv->incoming_servertype_picker); priv->entry_incomingserver = hildon_entry_new (MODEST_EDITABLE_SIZE); - g_signal_connect(G_OBJECT(priv->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 (priv->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL); set_default_custom_servernames (self); @@ -891,12 +929,6 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, 0); gtk_widget_show (priv->caption_incoming); - /* Change the caption title when the servertype changes, - * as in the UI spec: */ - g_signal_connect (G_OBJECT (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->incoming_servertype_picker))), - "changed", - G_CALLBACK (on_servertype_selector_changed), self); - /* Remember when the servername was changed manually: */ g_signal_connect (G_OBJECT (priv->entry_incomingserver), "changed", G_CALLBACK (on_entry_incoming_servername_changed), self); @@ -914,6 +946,15 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) modest_servertype_picker_set_active_servertype ( MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker), MODEST_PROTOCOLS_STORE_POP); + update_incoming_server_title (self); + update_incoming_server_security_choices (self); + set_default_custom_servernames (self); + + /* Change the caption title when the servertype changes, + * as in the UI spec: */ + g_signal_connect (G_OBJECT (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (priv->incoming_servertype_picker))), + "changed", + G_CALLBACK (on_servertype_selector_changed), self); align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0); @@ -927,6 +968,11 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); + /* Connect changed signals. We do it here after initializing everything */ + g_signal_connect (G_OBJECT(priv->entry_incomingserver), "changed", + G_CALLBACK(on_easysetup_changed), self); + + return GTK_WIDGET (pannable); } @@ -1000,8 +1046,7 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) /* The outgoing server widgets: */ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE); - g_signal_connect (G_OBJECT (priv->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 (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n(SMTP)", NULL); @@ -1034,8 +1079,6 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) _("mcen_fi_advsetup_connection_smtp")); gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), 0.0, 0.5); - g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled", - G_CALLBACK (on_easysetup_changed), self); gtk_widget_show (priv->checkbox_outgoing_smtp_specific); gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific, @@ -1072,6 +1115,12 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); + /* Connect changed signals. We do it here after initializing everything */ + g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed", + G_CALLBACK (on_easysetup_changed), self); + g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled", + G_CALLBACK (on_easysetup_changed), self); + return GTK_WIDGET (pannable); } @@ -1110,28 +1159,27 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data) static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self) { + gchar *complete_string; GtkWidget *align; - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); - GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); - GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings")); - hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + GtkWidget *box; + GtkWidget *label; + GtkWidget *button_edit; + + box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); + complete_string = g_strconcat (_("mcen_ia_emailsetup_setup_complete"), " ", + _("mcen_ia_customsetup_complete"), NULL); + label = gtk_label_new(complete_string); + g_free (complete_string); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_widget_set_size_request (label, LABELS_WIDTH, -1); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); - 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, 0.0); - gtk_widget_set_size_request (label, LABELS_WIDTH, -1); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); gtk_widget_show (label); + button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings")); + hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); gtk_widget_show (button_edit); gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, 0); @@ -1172,12 +1220,17 @@ on_response_before (ModestWizardDialog *wizard_dialog, /* 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. */ + gint dialog_response; + GtkWidget *dialog; - const gint dialog_response = gtk_dialog_run (dialog); + dialog = hildon_note_new_confirmation ((GtkWindow *) self, + _("imum_nc_wizard_confirm_lose_changes")); + + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + (GtkWindow *) dialog, + (GtkWindow *) wizard_dialog); + + dialog_response = gtk_dialog_run ((GtkDialog *) dialog); gtk_widget_destroy (GTK_WIDGET (dialog)); if (dialog_response != GTK_RESPONSE_OK) { @@ -1200,9 +1253,8 @@ fill_providers (ModestEasysetupWizardDialog *self) modest_country_picker_load_data( MODEST_COUNTRY_PICKER (priv->account_country_picker)); /* connect to country picker's changed signal, so we can fill the provider picker: */ - g_signal_connect (G_OBJECT (hildon_picker_button_get_selector - (HILDON_PICKER_BUTTON (priv->account_country_picker))), - "changed", + g_signal_connect ((GObject *) priv->account_country_picker, + "value-changed", G_CALLBACK (on_account_country_selector_changed), self); modest_country_picker_set_active_country_locale ( @@ -1296,11 +1348,15 @@ modest_easysetup_wizard_dialog_append_page (GtkNotebook *notebook, const gchar *label) { gint index; + /* Append page and set attributes */ index = gtk_notebook_append_page (notebook, page, gtk_label_new (label)); gtk_container_child_set (GTK_CONTAINER (notebook), page, "tab-expand", TRUE, "tab-fill", TRUE, NULL); + + /* Give focus to page and show it */ + gtk_container_set_focus_child (GTK_CONTAINER (notebook), page); gtk_widget_show (page); } @@ -1368,7 +1424,6 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) /* Initialize fields */ priv->check_support_done = FALSE; priv->check_support_show_progress_id = 0; - priv->check_support_progress_pulse_id = 0; priv->pending_check_support = 0; priv->destroyed = FALSE; priv->page_welcome = create_page_welcome (self); @@ -1512,17 +1567,31 @@ create_subsequent_easysetup_pages (ModestEasysetupWizardDialog *self) /* */ static void -remove_non_common_tabs (GtkNotebook *notebook, +remove_non_common_tabs (ModestEasysetupWizardDialog *self, gboolean remove_user_details) { gint starting_tab; + GtkNotebook *notebook; + ModestEasysetupWizardDialogPrivate *priv; + + priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); + g_object_get (self, "wizard-notebook", ¬ebook, NULL); + /* The first 2 tabs are the common ones (welcome tab and the providers tab), so we always remove starting from the end */ - starting_tab = (remove_user_details) ? 2 : 3; - while (gtk_notebook_get_n_pages (notebook) > starting_tab) + while (gtk_notebook_get_n_pages (notebook) > starting_tab) { + /* Disconnect signal */ + GtkWidget *page = gtk_notebook_get_nth_page (notebook, -1); + if (modest_signal_mgr_is_connected (priv->missing_data_signals, (GObject *) page, "missing-mandatory-data")) { + priv->missing_data_signals = modest_signal_mgr_disconnect (priv->missing_data_signals, + (GObject *) page, + "missing-mandatory-data"); + } + /* Remove page from notebook */ gtk_notebook_remove_page (notebook, -1); + } } static void @@ -1549,8 +1618,12 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) picker = MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker); id_type = modest_provider_picker_get_active_id_type (picker); g_object_get (self, "wizard-notebook", ¬ebook, NULL); - modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self), - NULL); + + /* Remove the response override handler for non-plugin + protocols. For plugins it'll be overriden later */ + if (id_type != MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL) + modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self), + NULL); if (id_type == MODEST_PROVIDER_PICKER_ID_OTHER) { @@ -1558,13 +1631,13 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) /* If we come from a rollbacked easysetup */ if (priv->page_complete_easysetup) { - remove_non_common_tabs (notebook, FALSE); + remove_non_common_tabs (self, FALSE); priv->page_complete_easysetup = NULL; } /* If we come from a rollbacked plugin protocol setup */ if (priv->last_plugin_protocol_selected != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) { - remove_non_common_tabs (notebook, TRUE); + remove_non_common_tabs (self, TRUE); priv->last_plugin_protocol_selected = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; modest_signal_mgr_disconnect_all_and_destroy (priv->missing_data_signals); priv->missing_data_signals = NULL; @@ -1574,7 +1647,7 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) } else { /* If we come from a rollbacked custom setup */ if (priv->page_custom_incoming) { - remove_non_common_tabs (notebook, TRUE); + remove_non_common_tabs (self, TRUE); init_user_page (priv); init_incoming_page (priv); init_outgoing_page (priv); @@ -1587,39 +1660,43 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) ModestProtocol *protocol; gchar *proto_name; ModestProtocolType proto_type; + ModestWizardDialogResponseOverrideFunc response_override; + + /* Get protocol data */ + proto_name = modest_provider_picker_get_active_provider_id (picker); + protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (), + MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS, + proto_name); + proto_type = modest_protocol_get_type_id (protocol); /* If we come from a rollbacked easy setup */ - if (priv->last_plugin_protocol_selected == - MODEST_PROTOCOL_REGISTRY_TYPE_INVALID && + if (priv->last_plugin_protocol_selected != proto_type && priv->page_complete_easysetup) { - remove_non_common_tabs (notebook, TRUE); + remove_non_common_tabs (self, TRUE); init_user_page (priv); priv->page_complete_easysetup = NULL; } - proto_name = modest_provider_picker_get_active_provider_id (picker); - protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (), - MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS, - proto_name); - proto_type = modest_protocol_get_type_id (protocol); + /* Ensure that the response override handler + is set. It might happen that plugins clear + them incorrectly */ + response_override = modest_account_protocol_get_wizard_response_override + (MODEST_ACCOUNT_PROTOCOL (protocol)); + modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self), + response_override); if (protocol && MODEST_IS_ACCOUNT_PROTOCOL (protocol) && proto_type != priv->last_plugin_protocol_selected) { ModestPairList *tabs; GSList *tmp; gboolean first_page = TRUE; - ModestWizardDialogResponseOverrideFunc response_override; /* Remember the last selected plugin protocol */ priv->last_plugin_protocol_selected = proto_type; /* Get tabs */ tabs = modest_account_protocol_get_easysetupwizard_tabs (MODEST_ACCOUNT_PROTOCOL (protocol)); - response_override = modest_account_protocol_get_wizard_response_override - (MODEST_ACCOUNT_PROTOCOL (protocol)); - modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self), - response_override); tmp = (GSList *) tabs; while (tmp) { ModestPair *pair = (ModestPair *) tmp->data; @@ -1653,7 +1730,7 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self) } else { if (priv->last_plugin_protocol_selected != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) { - remove_non_common_tabs (notebook, TRUE); + remove_non_common_tabs (self, TRUE); init_user_page (priv); priv->page_complete_easysetup = NULL; priv->last_plugin_protocol_selected = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; @@ -2075,8 +2152,8 @@ save_to_settings (ModestEasysetupWizardDialog *self) priv->settings); g_list_free (wizard_pages); } else { - g_warning ("The selected protocol is a plugin protocol "// - "but it's not a ModestAccountProtocol"); + g_debug ("The selected protocol is a plugin protocol "// + "but it's not a ModestAccountProtocol"); } g_free (provider_id); @@ -2266,6 +2343,11 @@ save_to_settings (ModestEasysetupWizardDialog *self) modest_account_settings_set_display_name (priv->settings, display_name); g_free (display_name); g_free (provider_id); + + /* This values are hardcoded for Fremantle */ + modest_account_settings_set_retrieve_type (priv->settings, + MODEST_ACCOUNT_RETRIEVE_MESSAGES_AND_ATTACHMENTS); + modest_account_settings_set_retrieve_limit (priv->settings, 20); } @@ -2365,22 +2447,6 @@ check_has_supported_auth_methods(ModestEasysetupWizardDialog* self) } static gboolean -check_support_progress_pulse (gpointer userdata) -{ - ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata; - ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); - - if (priv->destroyed) { - priv->check_support_progress_pulse_id = 0; - return FALSE; - } - - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress)); - - return TRUE; -} - -static gboolean check_support_show_progress (gpointer userdata) { ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata; @@ -2391,10 +2457,7 @@ check_support_show_progress (gpointer userdata) if (priv->destroyed) return FALSE; - gtk_widget_show (priv->check_support_progress); - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress)); - - priv->check_support_progress_pulse_id = g_timeout_add (200, check_support_progress_pulse, self); + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); return FALSE; } @@ -2414,18 +2477,13 @@ check_support_callback (ModestAccountProtocol *protocol, priv->check_support_show_progress_id = 0; } - if (priv->check_support_progress_pulse_id > 0) { - g_source_remove (priv->check_support_progress_pulse_id); - priv->check_support_progress_pulse_id = 0; - } - if (priv->pending_check_support == 0) { priv->check_support_done = TRUE; if (!priv->destroyed) { if (priv->presets) fill_providers (self); - gtk_widget_hide (priv->check_support_progress); + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE); invoke_enable_buttons_vfunc (self); } }