evolution-mapi r23 - trunk/src/account-setup-eplugin

[jjohnny svn gnome org]

Author: jjohnny
Date: Mon Dec  8 09:48:19 2008
New Revision: 23
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=23&view=rev

Log:
Account setup EPlugin : When *mapi* account creation fails, do not proceed. Otherwise don't stand in the way when non-mapi accounts are being created.

Modified:
   trunk/src/account-setup-eplugin/ChangeLog
   trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c

Modified: trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c
==============================================================================
--- trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c	(original)
+++ trunk/src/account-setup-eplugin/exchange-mapi-account-setup.c	Mon Dec  8 09:48:19 2008
@@ -345,26 +345,27 @@
 org_gnome_exchange_mapi_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 {
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)(data->config->target);
-	gboolean status = FALSE;
+	gboolean status = TRUE;
 
 	if (data->pageid != NULL && g_ascii_strcasecmp (data->pageid, "10.receive") == 0) {
-		CamelURL *url = camel_url_new (e_account_get_string(target->account,  E_ACCOUNT_SOURCE_URL), NULL);
+		CamelURL *url = camel_url_new (e_account_get_string(target->account,  
+								    E_ACCOUNT_SOURCE_URL), NULL);
+
 		if (url && url->protocol && g_ascii_strcasecmp (url->protocol, "mapi") == 0) {
 			const gchar *prof = NULL;
 
 			/* We assume that if the profile is set, then the setting is valid. */
  			prof = camel_url_get_param (url, "profile");
 
-			if (prof && *prof)
-				status = TRUE;
-		}
+			/*Profile not set. Do not proceed with account creation.*/
+			if (!(prof && *prof))
+			        status = FALSE;
+		} 
+
 		if (url)
 			camel_url_free(url);
 	}
 
-	/* FIXME: don't know why we should always return TRUE */
-	return TRUE;
-
 	return status;
 }