X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-easysetup-wizard-dialog.c;h=81322550567cad7063d4d5083a6843ca0ff20e63;hb=3657a0c4fbad8e7a2f27f92a053182968f24a8a1;hp=e866c1544a37a8f7b53f91ef68568260d1512a49;hpb=c847ef9527fe562b850a4f9c0988d0949fe75c72;p=modest

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index e866c15..8132255 100644
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -201,6 +201,26 @@ modest_easysetup_wizard_dialog_finalize (GObject *object)
 {
 	ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (object);
 	ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+	ModestProtocolRegistry *registry;
+	GSList *provider_protos, *node;
+
+	registry = modest_runtime_get_protocol_registry ();
+	provider_protos = modest_protocol_registry_get_by_tag (registry,
+							       MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS);
+
+	for (node = provider_protos; node != NULL; node = g_slist_next (node)) {
+		ModestProtocol *proto = MODEST_PROTOCOL (node->data);
+
+		if (!modest_protocol_registry_protocol_type_has_tag (registry,
+								     modest_protocol_get_type_id (proto),
+								     MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS))
+			continue;
+
+		if (MODEST_ACCOUNT_PROTOCOL (proto)) {
+			modest_account_protocol_wizard_finished (MODEST_ACCOUNT_PROTOCOL (proto));
+		}
+	}
+	g_slist_free (provider_protos);
 
 	if (priv->account_manager)
 		g_object_unref (G_OBJECT (priv->account_manager));
@@ -2122,6 +2142,35 @@ modest_easysetup_wizard_dialog_class_init (ModestEasysetupWizardDialogClass *kla
 	base_klass->save = on_save;
 }
 
+static void
+check_username_for_provider (const gchar *provider_id,
+			     const gchar *domain,
+			     gchar **username)
+{
+	gchar *providers_to_check[] = { "ovi.com", "yahoomailplus.com" };
+	gint i;
+	gboolean found = FALSE;
+	gchar *old;
+
+	/* Check if the username contains the @hostname, if not then add it */
+	if (strchr (*username, '@'))
+		return;
+
+	/* Check if it's one of the providers to check */
+	for (i = 0; i < G_N_ELEMENTS (providers_to_check) && !found; i++) {
+		if (!g_ascii_strncasecmp (providers_to_check[i], provider_id, strlen (providers_to_check[i])))
+			found = TRUE;
+	}
+
+	if (!found)
+		return;
+
+	/* Replace the username */
+	old = *username;
+	*username = g_strconcat (*username, "@", domain, NULL);
+	g_free (old);
+}
+
 /**
  * save_to_settings:
  * @self: a #ModestEasysetupWizardDialog
@@ -2134,7 +2183,8 @@ save_to_settings (ModestEasysetupWizardDialog *self)
 	ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
 	guint special_port;
 	gchar *provider_id = NULL;
-	gchar* display_name;
+	gchar *alternate_username = NULL;
+	gchar *display_name;
 	const gchar *username, *password;
 	gchar *store_hostname, *transport_hostname;
 	guint store_port, transport_port;
@@ -2208,6 +2258,8 @@ save_to_settings (ModestEasysetupWizardDialog *self)
 	if (provider_id) {
 		ModestProtocolType store_provider_server_type;
 		gboolean store_provider_use_alternate_port;
+		gchar *domain = NULL;
+
 		/* Use presets: */
 		store_hostname = modest_presets_get_server (priv->presets, provider_id,
 							    TRUE /* store */);
@@ -2225,6 +2277,17 @@ save_to_settings (ModestEasysetupWizardDialog *self)
 													provider_id,
 													TRUE /* store */);
 
+
+		/* This is HORRIBLE, but it seems that somehow it helps users
+		   that do not like to read the user instructions for their
+		   email accounts */
+		domain = modest_presets_get_domain (priv->presets, provider_id);
+		if (domain) {
+			alternate_username = g_strdup (username);
+			check_username_for_provider (provider_id, domain, &alternate_username);
+			g_free (domain);
+		}
+
 		/* We don't check for SMTP here as that is impossible for an incoming server. */
 		if (store_provider_server_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID)
 			store_protocol = MODEST_PROTOCOLS_STORE_POP;
@@ -2262,7 +2325,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
 
 	/* now we store the common store account settings */
 	modest_server_account_settings_set_hostname (store_settings, store_hostname);
-	modest_server_account_settings_set_username (store_settings, username);
+	modest_server_account_settings_set_username (store_settings, (alternate_username) ? alternate_username : username);
 	modest_server_account_settings_set_password (store_settings, password);
 	modest_server_account_settings_set_protocol (store_settings, store_protocol);
 
@@ -2348,12 +2411,14 @@ save_to_settings (ModestEasysetupWizardDialog *self)
 
 	/* now we store the common transport account settings */
 	modest_server_account_settings_set_hostname (transport_settings, transport_hostname);
-	modest_server_account_settings_set_username (transport_settings, username);
+	modest_server_account_settings_set_username (transport_settings, (alternate_username) ? alternate_username : username);
 	modest_server_account_settings_set_password (transport_settings, password);
 	modest_server_account_settings_set_protocol (transport_settings, transport_protocol);
 
 	g_object_unref (transport_settings);
 	g_free (transport_hostname);
+	if (alternate_username)
+		g_free (alternate_username);
 
 	fullname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_name));
 	email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));