lib-storage: Renamed MAILBOX_LIST_ITER_NO_AUTO_INBOX to _NO_AUTO_BOXES.

diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c
index b6e70af342b86c8edc732ead77a1ec20e5f1b65e..dfbdd04c9b375bf28fe1b93e1684f07a134563b9 100644 (file)
--- a/src/doveadm/doveadm-mail-altmove.c
+++ b/src/doveadm/doveadm-mail-altmove.c
@@ -46,7 +46,7 @@ cmd_altmove_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
 {
        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;

diff --git a/src/doveadm/doveadm-mail-expunge.c b/src/doveadm/doveadm-mail-expunge.c
index b9d63f15c3bcb98b5c3d97e8ee0363a14161cb53..24f2f267352f207d526a469e6a63bd67fb0411f3 100644 (file)
--- a/src/doveadm/doveadm-mail-expunge.c
+++ b/src/doveadm/doveadm-mail-expunge.c
@@ -166,7 +166,7 @@ cmd_expunge_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
 {
        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;

diff --git a/src/doveadm/doveadm-mail-fetch.c b/src/doveadm/doveadm-mail-fetch.c
index 47eafa2b51b7b07e762bc8aa4359d2b4c7b47435..f8f338b7ee12a71f1df986ffcaf7c7967917ebf1 100644 (file)
--- a/src/doveadm/doveadm-mail-fetch.c
+++ b/src/doveadm/doveadm-mail-fetch.c
@@ -423,7 +423,7 @@ cmd_fetch_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
 {
        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;

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index 9bc67ba8b9c25fd448a8c04c63e7bce6a7b01463..3bd65ba63ca0d582f6c367b80bd1f653216240ff 100644 (file)
--- a/src/doveadm/doveadm-mail-import.c
+++ b/src/doveadm/doveadm-mail-import.c
@@ -133,7 +133,7 @@ cmd_import_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
        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;

diff --git a/src/doveadm/doveadm-mail-mailbox-status.c b/src/doveadm/doveadm-mail-mailbox-status.c
index 3b9624278f0e02763e8ae0a1021d9a19e7dec5be..ab99c938611542e972e1af4ff9f03afbb63b232c 100644 (file)
--- a/src/doveadm/doveadm-mail-mailbox-status.c
+++ b/src/doveadm/doveadm-mail-mailbox-status.c
@@ -141,7 +141,7 @@ cmd_mailbox_status_run(struct doveadm_mail_cmd_context *_ctx,
        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;

diff --git a/src/doveadm/doveadm-mail-mailbox.c b/src/doveadm/doveadm-mail-mailbox.c
index 802ffb09ca41a4f53f95f8189d601063d5f42581..8ebe7560950e5fe9374fb6f1069491d01beceda9 100644 (file)
--- a/src/doveadm/doveadm-mail-mailbox.c
+++ b/src/doveadm/doveadm-mail-mailbox.c
@@ -101,7 +101,6 @@ cmd_mailbox_list_run(struct doveadm_mail_cmd_context *_ctx,
        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;

diff --git a/src/doveadm/doveadm-mail-search.c b/src/doveadm/doveadm-mail-search.c
index 550070729bd69a0a34c57591c562e74e8bd74394..501ec4749900ddcf0c5e92ed03a016f919d3aef3 100644 (file)
--- a/src/doveadm/doveadm-mail-search.c
+++ b/src/doveadm/doveadm-mail-search.c
@@ -48,7 +48,7 @@ cmd_search_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
 {
        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;

diff --git a/src/dsync/dsync-worker-local.c b/src/dsync/dsync-worker-local.c
index 9d308b56226ae47018aedd8a0da537a7c1a2987c..bfc5aaf29aa7eb1e2d274af1ab2e7dd5fd675aab 100644 (file)
--- a/src/dsync/dsync-worker-local.c
+++ b/src/dsync/dsync-worker-local.c
@@ -427,7 +427,7 @@ local_worker_mailbox_iter_init(struct dsync_worker *_worker)
        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);

diff --git a/src/lib-storage/list/mailbox-list-fs-iter.c b/src/lib-storage/list/mailbox-list-fs-iter.c
index 9fc90a501fb66926e5e7fe8667fec131b1122864..6eb19e9e3ab5c774f95cfa61e59f7033f51d88ca 100644 (file)
--- a/src/lib-storage/list/mailbox-list-fs-iter.c
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c
@@ -385,7 +385,7 @@ static struct mailbox_info *fs_list_inbox(struct fs_list_iterate_context *ctx)
        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;
 

diff --git a/src/lib-storage/list/mailbox-list-maildir-iter.c b/src/lib-storage/list/mailbox-list-maildir-iter.c
index ae516e1a7d8b4c7a7fa3905f0fd3d866b5aa8e56..a64e2777ccc062ece83bfb5d5024797da50398c9 100644 (file)
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c
+++ b/src/lib-storage/list/mailbox-list-maildir-iter.c
@@ -117,7 +117,7 @@ maildir_fill_inbox(struct maildir_list_iterate_context *ctx,
        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.

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
index c9c8bd02acd155ef7b20c875c38e6faec6ee3da9..a0ab96308a3f48cceed4bd348721422599b912bd 100644 (file)
--- a/src/lib-storage/mailbox-list.h
+++ b/src/lib-storage/mailbox-list.h
@@ -58,8 +58,9 @@ enum mailbox_list_iter_flags {
           (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. */