Only in evolution-data-server-3.8.5-bazsi/camel: camel-1.2.pc
Only in evolution-data-server-3.8.5-bazsi/camel: camel-imapx-server.c~
diff -u evolution-data-server-3.8.5/camel/camel-imapx-store-summary.c evolution-data-server-3.8.5-bazsi/camel/camel-imapx-store-summary.c
--- evolution-data-server-3.8.5/camel/camel-imapx-store-summary.c	2013-07-23 13:57:54.000000000 +0200
+++ evolution-data-server-3.8.5-bazsi/camel/camel-imapx-store-summary.c	2013-11-21 12:26:54.418559896 +0100
@@ -355,17 +355,26 @@
 {
 	gint len;
 	CamelIMAPXStoreNamespace *ns;
+	CamelIMAPXStoreNamespace *namespaces[] = 
+	{
+	  s->namespaces->personal, 
+	  s->namespaces->other, 
+	  s->namespaces->shared,
+	  NULL
+        };
+        gint i = 0;
 
-	/* NB: this currently only compares against 1 namespace, in future compare against others */
-	/* CHEN TODO */
-	ns = s->namespaces->personal;
-	while (ns) {
+	for (i = 0; i < 3; i++) {
+	        ns = namespaces[i];
+	        if (!ns)
+	          continue;
+
+		d ("find_path: comparing namespace '%s' to name '%s'\n", ns->path, path);
 		len = strlen (ns->path);
 		if (len == 0
 		    || (strncmp (ns->path, path, len) == 0
 			&& (path[len] == '/' || path[len] == 0)))
 			break;
-		ns = NULL;
 	}
 
 	/* have a default? */
@@ -378,11 +387,19 @@
 {
 	gint len = 0;
 	CamelIMAPXStoreNamespace *ns;
+	CamelIMAPXStoreNamespace *namespaces[] = 
+	{
+	  s->namespaces->personal, 
+	  s->namespaces->other, 
+	  s->namespaces->shared,
+	  NULL
+        };
+        gint i = 0;
 
-	/* NB: this currently only compares against 1 namespace, in future compare against others */
-	/* CHEN TODO */
-	ns = s->namespaces->personal;
-	while (ns) {
+	for (i = 0; i < 3; i++) {
+	        ns = namespaces[i];
+	        if (!ns)
+	          continue;
 		if (ns->full_name)
 			len = strlen (ns->full_name);
 		d ("find_full: comparing namespace '%s' to name '%s'\n", ns->full_name, full);
@@ -390,7 +407,6 @@
 		    || (strncmp (ns->full_name, full, len) == 0
 			&& (full[len] == ns->sep || full[len] == 0)))
 			break;
-		ns = NULL;
 	}
 
 	/* have a default? */
