Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6035:b6fe8568f207 HEAD
Return INBOX with namespace prefix if we're not in INBOX namespace.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Mon, 16 Jul 2007 03:22:26 +0300 |
parents | dcaa8d5296a9 |
children | 5d3a941444f1 |
files | src/lib-storage/list/mailbox-list-maildir-iter.c |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c Mon Jul 16 03:15:24 2007 +0300 +++ b/src/lib-storage/list/mailbox-list-maildir-iter.c Mon Jul 16 03:22:26 2007 +0300 @@ -117,7 +117,7 @@ /* make sure the pattern matches */ str_truncate(mailbox, 0); - if ((ctx->ctx.list->ns->flags & NAMESPACE_FLAG_INBOX) != 0 && + if ((ctx->ctx.list->ns->flags & NAMESPACE_FLAG_INBOX) == 0 || strcasecmp(fname + 1, "INBOX") != 0) str_append(mailbox, ctx->ctx.list->ns->prefix); str_append(mailbox, fname + 1); @@ -197,7 +197,9 @@ iter_is_mailbox(&ctx->ctx, ctx->dir, "", MAILBOX_LIST_FILE_TYPE_UNKNOWN, &flags); if (ret > 0) { - node = mailbox_tree_get(ctx->tree_ctx, "INBOX", NULL); + mailbox_c = t_strconcat(ctx->ctx.list->ns->prefix, + "INBOX", NULL); + node = mailbox_tree_get(ctx->tree_ctx, mailbox_c, NULL); node->flags = MAILBOX_NOCHILDREN | MAILBOX_MATCHED; } }