From: Timo Sirainen <tss@iki.fi>
Date: Mon, 20 Apr 2009 17:28:00 +0000 (-0400)
Subject: namespaces: list=children wasn't working correctly.
X-Git-Tag: 2.0.alpha1~910
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aef95687bc8d78e14a6e6746cd4ef061f158fb9a;p=thirdparty%2Fdovecot%2Fcore.git

namespaces: list=children wasn't working correctly.

--HG--
branch : HEAD
---

diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index fa83246cfe..ff1b5909be 100644
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -214,8 +214,7 @@ static bool list_namespace_has_children(struct cmd_list_context *ctx)
 	return ret;
 }
 
-static const char *ns_get_listed_prefix(struct cmd_list_context *ctx,
-					bool *have_children)
+static const char *ns_get_listed_prefix(struct cmd_list_context *ctx)
 {
 	struct imap_match_glob *glob;
 	enum imap_match_result match;
@@ -237,7 +236,6 @@ static const char *ns_get_listed_prefix(struct cmd_list_context *ctx,
 		match = imap_match(glob, ns_prefix);
 	}
 	i_assert(match == IMAP_MATCH_YES);
-	*have_children = TRUE;
 	return ns_prefix;
 }
 
@@ -275,7 +273,7 @@ list_namespace_send_prefix(struct cmd_list_context *ctx, bool have_children)
 		flags = MAILBOX_NONEXISTENT;
 	}
 
-	name = ns_get_listed_prefix(ctx, &have_children);
+	name = ns_get_listed_prefix(ctx);
 
 	if ((flags & MAILBOX_CHILDREN) == 0) {
 		if (have_children || list_namespace_has_children(ctx)) {