dovecot-2.0: fs layout: Fixed listing child mailboxes under INBOX.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/dbb05e38295a
changeset: 11016:dbb05e38295a
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Mar 29 17:47:44 2010 +0300
description:
fs layout: Fixed listing child mailboxes under INBOX.

diffstat:

 src/lib-storage/list/mailbox-list-fs-iter.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r b791ebb2c700 -r dbb05e38295a src/lib-storage/list/mailbox-list-fs-iter.c
--- a/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Mar 29 17:22:35 2010 +0300
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Mar 29 17:47:44 2010 +0300
@@ -441,8 +441,11 @@
 	}
 	inbox_flags_set(ctx);
 
-	if (list_file_is_inbox(ctx, fname)) {
-		/* delay listing in case there's a INBOX/ directory */
+	if (list_file_is_inbox(ctx, fname) &&
+	    (ctx->ctx.list->flags & MAILBOX_LIST_FLAG_MAILBOX_FILES) != 0) {
+		/* delay listing in case there's a INBOX/ directory.
+		   do this only when INBOX is a file! otherwise we won't list
+		   INBOX children. */
 		ctx->inbox_found = TRUE;
 		ctx->inbox_flags = ctx->info.flags;
 		return FALSE;