Mercurial > dovecot > core-2.2
changeset 12862:d805c7ce8d67
lib-storage: Renamed MAILBOX_LIST_ITER_NO_AUTO_INBOX to _NO_AUTO_BOXES.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 23 Mar 2011 22:54:24 +0200 |
parents | 2db1d9cbc334 |
children | b16512b60808 |
files | src/doveadm/doveadm-mail-altmove.c src/doveadm/doveadm-mail-expunge.c src/doveadm/doveadm-mail-fetch.c src/doveadm/doveadm-mail-import.c src/doveadm/doveadm-mail-mailbox-status.c src/doveadm/doveadm-mail-mailbox.c src/doveadm/doveadm-mail-search.c src/dsync/dsync-worker-local.c src/lib-storage/list/mailbox-list-fs-iter.c src/lib-storage/list/mailbox-list-maildir-iter.c src/lib-storage/mailbox-list.h |
diffstat | 11 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-altmove.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-altmove.c Wed Mar 23 22:54:24 2011 +0200 @@ -46,7 +46,7 @@ { const enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-expunge.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-expunge.c Wed Mar 23 22:54:24 2011 +0200 @@ -166,7 +166,7 @@ { const enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-fetch.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-fetch.c Wed Mar 23 22:54:24 2011 +0200 @@ -423,7 +423,7 @@ { struct fetch_cmd_context *ctx = (struct fetch_cmd_context *)_ctx; const enum mailbox_list_iter_flags iter_flags = - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-import.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-import.c Wed Mar 23 22:54:24 2011 +0200 @@ -133,7 +133,7 @@ struct import_cmd_context *ctx = (struct import_cmd_context *)_ctx; const enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-mailbox-status.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-mailbox-status.c Wed Mar 23 22:54:24 2011 +0200 @@ -141,7 +141,7 @@ struct status_cmd_context *ctx = (struct status_cmd_context *)_ctx; enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-mailbox.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-mailbox.c Wed Mar 23 22:54:24 2011 +0200 @@ -101,7 +101,6 @@ struct list_cmd_context *ctx = (struct list_cmd_context *)_ctx; enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/doveadm/doveadm-mail-search.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/doveadm/doveadm-mail-search.c Wed Mar 23 22:54:24 2011 +0200 @@ -48,7 +48,7 @@ { const enum mailbox_list_iter_flags iter_flags = MAILBOX_LIST_ITER_RAW_LIST | - MAILBOX_LIST_ITER_NO_AUTO_INBOX | + MAILBOX_LIST_ITER_NO_AUTO_BOXES | MAILBOX_LIST_ITER_RETURN_NO_FLAGS; struct doveadm_mail_list_iter *iter; const struct mailbox_info *info;
--- a/src/dsync/dsync-worker-local.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/dsync/dsync-worker-local.c Wed Mar 23 22:54:24 2011 +0200 @@ -427,7 +427,7 @@ struct local_dsync_worker_mailbox_iter *iter; enum mailbox_list_iter_flags list_flags = MAILBOX_LIST_ITER_SKIP_ALIASES | - MAILBOX_LIST_ITER_NO_AUTO_INBOX; + MAILBOX_LIST_ITER_NO_AUTO_BOXES; static const char *patterns[] = { "*", NULL }; iter = i_new(struct local_dsync_worker_mailbox_iter, 1);
--- a/src/lib-storage/list/mailbox-list-fs-iter.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/lib-storage/list/mailbox-list-fs-iter.c Wed Mar 23 22:54:24 2011 +0200 @@ -385,7 +385,7 @@ if (mailbox_list_mailbox(ctx->ctx.list, "INBOX", &ctx->info.flags) < 0) ctx->ctx.failed = TRUE; - if ((ctx->ctx.flags & MAILBOX_LIST_ITER_NO_AUTO_INBOX) != 0 && + if ((ctx->ctx.flags & MAILBOX_LIST_ITER_NO_AUTO_BOXES) != 0 && (ctx->info.flags & MAILBOX_NONEXISTENT) != 0) return NULL;
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c Thu Mar 17 16:37:45 2011 +0200 +++ b/src/lib-storage/list/mailbox-list-maildir-iter.c Wed Mar 23 22:54:24 2011 +0200 @@ -117,7 +117,7 @@ bool created; int ret; - if ((ctx->ctx.flags & MAILBOX_LIST_ITER_NO_AUTO_INBOX) == 0) { + if ((ctx->ctx.flags & MAILBOX_LIST_ITER_NO_AUTO_BOXES) == 0) { /* always show INBOX */ } else { /* INBOX may be Maildir root or completely elsewhere.
--- a/src/lib-storage/mailbox-list.h Thu Mar 17 16:37:45 2011 +0200 +++ b/src/lib-storage/mailbox-list.h Wed Mar 23 22:54:24 2011 +0200 @@ -58,8 +58,9 @@ (maybe \noselect), have LIST also return "foo/" in the replies. This is needed by IMAP, but messes up internal code. */ MAILBOX_LIST_ITER_SHOW_EXISTING_PARENT = 0x000002, - /* Don't list INBOX unless it actually exists */ - MAILBOX_LIST_ITER_NO_AUTO_INBOX = 0x000004, + /* Don't list autocreated mailboxes (e.g. INBOX) unless they + physically exist */ + MAILBOX_LIST_ITER_NO_AUTO_BOXES = 0x000004, /* For mailbox_list_iter_init_namespaces(): Skip namespaces that have alias_for set. */