Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-easysetup-wizard-dialog.c

diff --git a/src/widgets/modest-easysetup-wizard-dialog.c b/src/widgets/modest-easysetup-wizard-dialog.c
index ee12e96..5821f1d 100644 (file)
--- a/src/widgets/modest-easysetup-wizard-dialog.c
+++ b/src/widgets/modest-easysetup-wizard-dialog.c
@@ -141,6 +141,7 @@ struct _ModestEasysetupWizardDialogPrivate
 
        GtkWidget *page_complete_customsetup;
 
+       gint last_mcc;
        ModestProtocolType last_plugin_protocol_selected;
        GSList *missing_data_signals;
 };
@@ -460,7 +461,12 @@ on_account_country_selector_changed (GtkWidget *widget, gpointer user_data)
        /* Fill the providers selector, based on the selected country: */
        if (priv->presets != NULL) {
                gint mcc = modest_country_selector_get_active_country_mcc (priv->account_country_selector);
-               modest_provider_selector_fill (priv->account_serviceprovider_selector, priv->presets, mcc);
+               if (priv->last_mcc != mcc) {
+                       modest_provider_selector_fill (priv->account_serviceprovider_selector, priv->presets, mcc);
+               } else {
+                       modest_provider_selector_refresh (priv->account_serviceprovider_selector);
+               }
+               priv->last_mcc = mcc;
        }
 }
 
@@ -1398,9 +1404,13 @@ fill_providers (ModestEasysetupWizardDialog *self)
 
                modest_country_selector_set_active_country_locale (priv->account_country_selector);
                mcc = modest_country_selector_get_active_country_mcc (priv->account_country_selector);
-               modest_provider_selector_fill (
-                       priv->account_serviceprovider_selector,
-                       priv->presets, mcc);
+               if (priv->last_mcc != mcc) {
+                       modest_provider_selector_fill (priv->account_serviceprovider_selector,
+                                                      priv->presets, mcc);
+               } else {
+                       modest_provider_selector_refresh (priv->account_serviceprovider_selector);
+               }
+               priv->last_mcc = mcc;
                /* connect to providers picker's changed signal, so we can fill the email address: */
                if (GTK_IS_COMBO_BOX (priv->account_serviceprovider_selector)) {
                        g_signal_connect (priv->account_serviceprovider_selector,
@@ -1584,6 +1594,7 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
        priv->page_complete_easysetup = NULL;
        priv->page_complete_customsetup = NULL;
        priv->last_plugin_protocol_selected = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
+       priv->last_mcc = -1;
        priv->missing_data_signals = NULL;
 
        /* Add the common pages */
@@ -2121,6 +2132,9 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
                }
 
                modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+               hildon_gtk_window_take_screenshot ((GtkWindow *) dialog, FALSE);
+#endif
        }
 
 
@@ -2560,6 +2574,7 @@ on_save (ModestWizardDialog *dialog)
 {
        ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (dialog);
        ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+       gboolean result;
 
        save_to_settings (self);
 
@@ -2568,7 +2583,14 @@ on_save (ModestWizardDialog *dialog)
                return FALSE;
        }
 
-       return modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+       
+       result = modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+       if (result) {
+               hildon_gtk_window_take_screenshot ((GtkWindow *) dialog, FALSE);
+       }
+#endif
+       return result;
 
 }