[evolution-ews/gnome-3-6] Bug #687228 - Master's ESource change causes rewrite of GAL ESource

[Milan Crha <mcrha src gnome org>]

commit 71fe5d5555032fc9420fad5ae85591c795a2e409
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 31 19:36:32 2012 +0100

    Bug #687228 - Master's ESource change causes rewrite of GAL ESource

 src/collection/e-ews-backend.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/collection/e-ews-backend.c b/src/collection/e-ews-backend.c
index d089a81..81f5f0e 100644
--- a/src/collection/e-ews-backend.c
+++ b/src/collection/e-ews-backend.c
@@ -369,12 +369,18 @@ ews_backend_add_gal_source (EEwsBackend *backend)
 	if (oal_selected != NULL) {
 		gchar *cp = strrchr (oal_selected, ':');
 		if (cp != NULL) {
-			*cp++ = '\0';
+			/* skip ':' and any leading backslash in the display name */
+			cp++;
+			while (*cp && *cp == '\\')
+				cp++;
+
 			display_name = cp;
 			oal_id = oal_selected;
 		} else {
 			g_free (oal_selected);
 			oal_selected = NULL;
+
+			camel_ews_settings_set_oal_selected (settings, NULL);
 		}
 	}