dovecot-1.2: lib-storage: Maildir++ mailbox listing could have g...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/8c8bde0f9120
changeset: 9627:8c8bde0f9120
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Nov 02 19:23:37 2010 +0000
description:
lib-storage: Maildir++ mailbox listing could have given wrong flags to parent mailboxes.

diffstat:

 src/lib-storage/list/mailbox-list-maildir-iter.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r ec7ce2647131 -r 8c8bde0f9120 src/lib-storage/list/mailbox-list-maildir-iter.c
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c	Tue Nov 02 17:31:14 2010 +0000
+++ b/src/lib-storage/list/mailbox-list-maildir-iter.c	Tue Nov 02 19:23:37 2010 +0000
@@ -38,7 +38,7 @@
 static void
 maildir_fill_parents(struct maildir_list_iterate_context *ctx,
 		     struct imap_match_glob *glob, bool update_only,
-		     string_t *mailbox, enum mailbox_info_flags flags)
+		     string_t *mailbox)
 {
 	struct mail_namespace *ns = ctx->ctx.list->ns;
 	struct mailbox_node *node;
@@ -81,7 +81,7 @@
 			}
 			if (!update_only)
 				node->flags |= MAILBOX_MATCHED;
-			node->flags |= MAILBOX_CHILDREN | flags;
+			node->flags |= MAILBOX_CHILDREN;
 			node->flags &= ~MAILBOX_NOCHILDREN;
 			node_fix_parents(node);
 		}
@@ -202,7 +202,7 @@
 		if ((match & IMAP_MATCH_PARENT) != 0) {
 			T_BEGIN {
 				maildir_fill_parents(ctx, glob, update_only,
-						     mailbox, flags);
+						     mailbox);
 			} T_END;
 		} else {
 			created = FALSE;