From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 25 Jun 2018 09:16:25 +0000 (+0300)
Subject: imapc: Move selected=TRUE to imap_mailbox_select_finish()
X-Git-Tag: 2.3.9~1683
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d8809625a6074c4c950a37e6b4818abc3653635;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Move selected=TRUE to imap_mailbox_select_finish()

Minor code deduplication cleanup.
---

diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index b8b117cb53..0bcefce486 100644
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -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
diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 58d448e8c8..a39bf62f5e 100644
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -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) {