dovecot-2.2: lib-storage: If INBOX isn't subscribed, don't retur...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/438561ec237b
changeset: 16093:438561ec237b
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 24 15:33:36 2013 +0200
description:
lib-storage: If INBOX isn't subscribed, don't return it in subscriptions list.

diffstat:

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

diffs (13 lines):

diff -r fed3adf86ab5 -r 438561ec237b src/lib-storage/list/mailbox-list-iter.c
--- a/src/lib-storage/list/mailbox-list-iter.c	Fri Mar 22 19:45:52 2013 +0200
+++ b/src/lib-storage/list/mailbox-list-iter.c	Sun Mar 24 15:33:36 2013 +0200
@@ -732,7 +732,8 @@
 	ctx->patterns = p_new(pool, const char *, count + 1);
 	for (i = 0; i < count; i++)
 		ctx->patterns[i] = p_strdup(pool, patterns[i]);
-	if (patterns_match_inbox(namespaces, ctx->patterns)) {
+	if (patterns_match_inbox(namespaces, ctx->patterns) &&
+	    (flags & MAILBOX_LIST_ITER_SELECT_SUBSCRIBED) == 0) {
 		/* we're going to list the INBOX. get its own flags (i.e. not
 		   [no]children) immediately, so if we end up seeing something
 		   else called INBOX (e.g. namespace prefix) we can show it