backport an additional fix for #725 and bump versionv2.2.11-rc4

2 files changed, 29 insertions, 28 deletions

diff --git a/VERSION b/VERSION
index 2ff281ce..7d841b2d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.11-rc3
+2.2.11-rc4
diff --git a/imapcommands.c b/imapcommands.c
index f3071a72..202098b6 100644
--- a/imapcommands.c
+++ b/imapcommands.c
@@ -744,35 +744,36 @@ int _ic_list(struct ImapSession *self)
 			continue;
 
 		/* Enforce match of mailbox to pattern. */
-		if ((! listex_match(pattern, mb->name, MAILBOX_SEPARATOR, 0)) && (g_str_has_suffix(pattern,"%"))) {
-			/*
-			   If the "%" wildcard is the last character of a mailbox name argument, matching levels
-			   of hierarchy are also returned.  If these levels of hierarchy are not also selectable 
-			   mailboxes, they are returned with the \Noselect mailbox name attribute
-			 */
-
-			TRACE(TRACE_DEBUG, "mailbox [%s] doesn't match pattern [%s]", mb->name, pattern);
-			char *m = NULL, **p = g_strsplit(mb->name,MAILBOX_SEPARATOR,0);
-
-			int l = g_strv_length(p);
-			while (l-- > 1) {
-				if (p[l]) {
-					g_free(p[l]);
-					p[l] = NULL;
+		if (! listex_match(pattern, mb->name, MAILBOX_SEPARATOR, 0)) {
+			if (g_str_has_suffix(pattern,"%")) {
+				/*
+				   If the "%" wildcard is the last character of a mailbox name argument, matching levels
+				   of hierarchy are also returned.  If these levels of hierarchy are not also selectable 
+				   mailboxes, they are returned with the \Noselect mailbox name attribute
+				 */
+
+				TRACE(TRACE_DEBUG, "mailbox [%s] doesn't match pattern [%s]", mb->name, pattern);
+				char *m = NULL, **p = g_strsplit(mb->name,MAILBOX_SEPARATOR,0);
+				int l = g_strv_length(p);
+				while (l-- > 1) {
+					if (p[l]) {
+						g_free(p[l]);
+						p[l] = NULL;
+					}
+					m = g_strjoinv(MAILBOX_SEPARATOR,p);
+
+					if (listex_match(pattern, m, MAILBOX_SEPARATOR, 0)) {
+						g_free(mb->name);
+						mb->name = m;
+						mb->no_select = 1;
+						mb->no_children = 0;
+						show = TRUE;
+						break;
+					}
+					g_free(m);
 				}
-				m = g_strjoinv(MAILBOX_SEPARATOR,p);
-
-				if (listex_match(pattern, m, MAILBOX_SEPARATOR, 0)) {
-					g_free(mb->name);
-					mb->name = m;
-					mb->no_select = 1;
-					mb->no_children = 0;
-					show = TRUE;
-					break;
-				}
-				g_free(m);
+				g_strfreev(p);
 			}
-			g_strfreev(p);
 		} else {
 			show = TRUE;
 		}