From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 20 Oct 2008 19:42:59 +0000 (+0000)
Subject: * Now we make sure we set the initial user email checking provider,
X-Git-Tag: git_migration_finished~1126
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=7a059966235f7caf57a34976335524ff988ebf6b

* Now we make sure we set the initial user email checking provider,
  even just after creating it (fixes NB#89255).

pmo-trunk-r6129
---

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 638e5e1..c070370 100644
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -318,19 +318,19 @@ on_account_country_selector_changed (HildonTouchSelector *widget, gint column, g
 }
 
 static void
-on_account_serviceprovider_selector_changed (HildonTouchSelector *widget, gint column, gpointer user_data)
+update_user_email_from_provider (ModestEasysetupWizardDialog *self)
 {
-	ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+	ModestEasysetupWizardDialogPrivate *priv; 
+	gchar* provider_id;
+	gchar* domain_name = NULL;
+
 	g_assert(self);
-	ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
-	
-	priv->dirty = TRUE;
-	
+	priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
 	/* Fill the providers combo, based on the selected country: */
-	gchar* provider_id = modest_provider_picker_get_active_provider_id (
+	provider_id = modest_provider_picker_get_active_provider_id (
 		MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
 	
-	gchar* domain_name = NULL;
 	if(provider_id)
 		domain_name = modest_presets_get_domain (priv->presets, provider_id);
 	
@@ -346,6 +346,18 @@ on_account_serviceprovider_selector_changed (HildonTouchSelector *widget, gint c
 }
 
 static void
+on_account_serviceprovider_selector_changed (HildonTouchSelector *widget, gint column, gpointer user_data)
+{
+	ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+	g_assert(self);
+	ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+	
+	priv->dirty = TRUE;
+
+	update_user_email_from_provider (self);
+}
+
+static void
 on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 {
 	modest_platform_information_banner (GTK_WIDGET (self), NULL,
@@ -541,7 +553,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
 	hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
 	caption = create_captioned (self, sizegroup, 
 				    _("mcen_li_emailsetup_email_address"), priv->entry_user_email);
-	gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */
+	update_user_email_from_provider (self);
 	gtk_widget_show (priv->entry_user_email);
 	gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
 	g_signal_connect(G_OBJECT(priv->entry_user_email), "changed",