evolution-data-server r8986 - in trunk/servers/exchange: . lib

[mcrha svn gnome org]

Author: mcrha
Date: Mon Jun 16 11:35:56 2008
New Revision: 8986
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8986&view=rev

Log:
2008-06-16  Milan Crha  <mcrha redhat com>

	** Part of fix for bug #273627

	* lib/e2k-autoconfig.c: (validate):
	Use mailbox value from ExchangeParams structure if set, otherwise
	extract mailbox from the home_uri as before.



Modified:
   trunk/servers/exchange/ChangeLog
   trunk/servers/exchange/lib/e2k-autoconfig.c

Modified: trunk/servers/exchange/lib/e2k-autoconfig.c
==============================================================================
--- trunk/servers/exchange/lib/e2k-autoconfig.c	(original)
+++ trunk/servers/exchange/lib/e2k-autoconfig.c	Mon Jun 16 11:35:56 2008
@@ -1506,15 +1506,21 @@
 		euri = e2k_uri_new (ac->home_uri);
 		path = g_strdup (euri->path + 1);
 		e2k_uri_free (euri);
-		mailbox = strrchr (path, '/');
-		if (mailbox && !mailbox[1]) {
-			*mailbox = '\0';
+
+		/* change a mailbox only if not set by the caller */
+		if (!exchange_params->mailbox || !*exchange_params->mailbox) {
 			mailbox = strrchr (path, '/');
+			if (mailbox && !mailbox[1]) {
+				*mailbox = '\0';
+				mailbox = strrchr (path, '/');
+			}
+			if (mailbox)
+				*mailbox++ = '\0';
+
+			g_free (exchange_params->mailbox);
+			exchange_params->mailbox  = g_strdup (mailbox);
 		}
-		if (mailbox)
-			*mailbox++ = '\0';
 
-		exchange_params->mailbox  = g_strdup (mailbox);
 		exchange_params->owa_path = g_strdup_printf ("%s%s", "/", path);
 		g_free (path);
 		exchange_params->host = g_strdup (ac->pf_server);