Mercurial > dovecot > original-hg > dovecot-2.1

changeset 14992:589d2f485a6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Fixed listing INBOX's children with LAYOUT=fs and non-mbox format.
author Timo Sirainen <tss@iki.fi>
date Mon, 05 Aug 2013 17:38:13 +0300
parents b986ac5e1d98
children c7832e75d2a8
files src/lib-storage/list/mailbox-list-fs-iter.c
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/list/mailbox-list-fs-iter.c	Tue Jul 30 13:26:40 2013 +0300
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c	Mon Aug 05 17:38:13 2013 +0300
@@ -680,9 +680,16 @@
 				/* no children */
 			} else if ((ctx->ctx.list->flags &
 				    MAILBOX_LIST_FLAG_MAILBOX_FILES) == 0) {
-				/* skip its children also */
-				ctx->dir = dir;
-				pool_unref(&subdir->pool);
+				if (strcmp(storage_name, "INBOX") == 0) {
+					/* INBOX and its children are in
+					   different paths */
+					ctx->inbox_has_children = TRUE;
+				} else {
+					/* naming conflict, skip its
+					   children also */
+					ctx->dir = dir;
+					pool_unref(&subdir->pool);
+				}
 			} else if ((ctx->info.flags & MAILBOX_NOINFERIORS) == 0) {
 				/* INBOX itself is \NoInferiors, but this INBOX
 				   is a directory, and we can make INBOX have