imapc: Code cleanup - imapc_connection_reconnect() is now always called when reconnec...

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index f23c39e9996d87bf327e52a3b6008b3c38fd740c..a582c91806997c2f9a28ef2ba81d44c8afb245a4 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -319,21 +319,16 @@ bool imapc_client_mailbox_can_reconnect(struct imapc_client_mailbox *box)
 
 void imapc_client_mailbox_reconnect(struct imapc_client_mailbox *box)
 {
-       bool reconnect = imapc_client_mailbox_can_reconnect(box);
+       i_assert(!box->reconnecting);
 
-       if (reconnect) {
-               i_assert(!box->reconnecting);
-               box->reconnecting = TRUE;
-       }
-       imapc_connection_disconnect(box->conn);
-       if (reconnect) {
-               imapc_connection_connect(box->conn,
-                                        imapc_client_reconnect_cb, box);
-       }
+       box->reconnecting = TRUE;
        /* if we fail again, avoid reconnecting immediately. if the server is
           broken we could just get into an infinitely failing reconnection
           loop. */
        box->reconnect_ok = FALSE;
+
+       imapc_connection_disconnect(box->conn);
+       imapc_connection_connect(box->conn, imapc_client_reconnect_cb, box);
 }
 
 void imapc_client_mailbox_close(struct imapc_client_mailbox **_box)