]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
imapc: Move selected=TRUE to imap_mailbox_select_finish()
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 25 Jun 2018 09:16:25 +0000 (12:16 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Mon, 25 Jun 2018 09:16:25 +0000 (12:16 +0300)
Minor code deduplication cleanup.

src/lib-storage/index/imapc/imapc-mailbox.c
src/lib-storage/index/imapc/imapc-storage.c

index b8b117cb53817bc5204229675da52164f6efb791..0bcefce486295934eb2a355bfd8c22f6b970fa7d 100644 (file)
@@ -242,6 +242,7 @@ void imap_mailbox_select_finish(struct imapc_mailbox *mbox)
                imapc_mailbox_init_delayed_trans(mbox);
                imapc_mailbox_fetch_state_finish(mbox);
        }
+       mbox->selected = TRUE;
 }
 
 static void
index 58d448e8c852ca212b537cb7081d0c8d210c9dde..a39bf62f5e3628debe65165a919b97042d6247f9 100644 (file)
@@ -591,7 +591,6 @@ imapc_mailbox_reopen_callback(const struct imapc_command_reply *reply,
        else if (imapc_mailbox_verify_select(mbox, &errmsg)) {
                imap_mailbox_select_finish(mbox);
                errmsg = NULL;
-               mbox->selected = TRUE;
        }
 
        if (errmsg != NULL) {
@@ -663,7 +662,6 @@ imapc_mailbox_open_callback(const struct imapc_command_reply *reply,
                        ctx->ret = -1;
                } else {
                        imap_mailbox_select_finish(ctx->mbox);
-                       ctx->mbox->selected = TRUE;
                        ctx->ret = 0;
                }
        } else if (reply->state == IMAPC_COMMAND_STATE_NO) {