evolution-data-server r9788 - in branches/gnome-2-24/servers/exchange: . lib
- From: mcrha svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-data-server r9788 - in branches/gnome-2-24/servers/exchange: . lib
- Date: Tue, 2 Dec 2008 12:18:15 +0000 (UTC)
Author: mcrha
Date: Tue Dec 2 12:18:15 2008
New Revision: 9788
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9788&view=rev
Log:
2008-12-02 Milan Crha <mcrha redhat com>
** Fix for bug #562228
* lib/e2k-autoconfig.c: (validate): Always store correct owa_path when
validating, without trailing slash and without mailbox name.
Modified:
branches/gnome-2-24/servers/exchange/ChangeLog
branches/gnome-2-24/servers/exchange/lib/e2k-autoconfig.c
Modified: branches/gnome-2-24/servers/exchange/lib/e2k-autoconfig.c
==============================================================================
--- branches/gnome-2-24/servers/exchange/lib/e2k-autoconfig.c (original)
+++ branches/gnome-2-24/servers/exchange/lib/e2k-autoconfig.c Tue Dec 2 12:18:15 2008
@@ -1516,6 +1516,8 @@
}
if (*result == E2K_AUTOCONFIG_OK) {
+ int len;
+
*result = e2k_autoconfig_check_global_catalog (ac, &op);
e2k_operation_free (&op);
@@ -1524,6 +1526,13 @@
path = g_strdup (euri->path + 1);
e2k_uri_free (euri);
+ /* no slash at the end of path */
+ len = strlen (path);
+ while (len && path [len - 1] == '/') {
+ path [len - 1] = '\0';
+ len--;
+ }
+
/* change a mailbox only if not set by the caller */
if (!exchange_params->mailbox || !*exchange_params->mailbox) {
mailbox = strrchr (path, '/');
@@ -1536,6 +1545,12 @@
g_free (exchange_params->mailbox);
exchange_params->mailbox = g_strdup (mailbox);
+ } else {
+ /* always strip the mailbox part from the path */
+ char *slash = strrchr (path, '/');
+
+ if (slash)
+ *slash = '\0';
}
exchange_params->owa_path = g_strdup_printf ("%s%s", "/", path);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]