imapc: Removed unused "stop now" functionality.

diff --git a/src/lib-imap-client/imapc-client-private.h b/src/lib-imap-client/imapc-client-private.h
index 1a40270f8887547987cedd6c03df9053ea0c430e..6d053138c20364ec8534446ae3d9e6ed09d877fb 100644 (file)
--- a/src/lib-imap-client/imapc-client-private.h
+++ b/src/lib-imap-client/imapc-client-private.h
@@ -21,8 +21,6 @@ struct imapc_client {
        ARRAY_DEFINE(conns, struct imapc_client_connection *);
 
        struct ioloop *ioloop;
-
-       unsigned int stop_now:1;
 };
 
 struct imapc_client_mailbox {

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index 1e8c5df47f0fed18046186c62d628e5b7af449c2..bf0a5f1960d5b06c34719a82b260330af28bae63 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -122,20 +122,15 @@ void imapc_client_run_pre(struct imapc_client *client)
 {
        struct imapc_client_connection *const *connp;
        struct ioloop *prev_ioloop = current_ioloop;
-       bool handle_pending = client->stop_now;
 
        i_assert(client->ioloop == NULL);
 
-       client->stop_now = FALSE;
-
        client->ioloop = io_loop_create();
        io_loop_set_running(client->ioloop);
 
        array_foreach(&client->conns, connp) {
                imapc_connection_ioloop_changed((*connp)->conn);
                imapc_connection_connect((*connp)->conn, NULL, NULL);
-               if (handle_pending)
-                       imapc_connection_input_pending((*connp)->conn);
        }
 
        if (io_loop_is_running(client->ioloop))
@@ -167,12 +162,6 @@ bool imapc_client_is_running(struct imapc_client *client)
        return client->ioloop != NULL;
 }
 
-void imapc_client_stop_now(struct imapc_client *client)
-{
-       client->stop_now = TRUE;
-       imapc_client_stop(client);
-}
-
 static struct imapc_client_connection *
 imapc_client_add_connection(struct imapc_client *client)
 {

diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h
index de63f735398a8823dceb630a3a65999e6752f451..1b916081ecf1d4f505483c61cd4681f91fb442e8 100644 (file)
--- a/src/lib-imap-client/imapc-client.h
+++ b/src/lib-imap-client/imapc-client.h
@@ -132,9 +132,6 @@ void imapc_client_register_untagged(struct imapc_client *client,
 void imapc_client_run_pre(struct imapc_client *client);
 void imapc_client_run_post(struct imapc_client *client);
 void imapc_client_stop(struct imapc_client *client);
-/* Stop immediately, don't finish even any already read pending replies.
-   They'll be finished when imapc_client_run() is again called. */
-void imapc_client_stop_now(struct imapc_client *client);
 bool imapc_client_is_running(struct imapc_client *client);
 
 struct imapc_client_mailbox *

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 4ec2aae7bbf00df4403fd903132e716e694eae50..56edc0b45fddfde9552fa92e52f9ba8dc138cb4f 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1294,7 +1294,7 @@ void imapc_connection_input_pending(struct imapc_connection *conn)
                timeout_reset(conn->to);
 
        o_stream_cork(conn->output);
-       while (ret > 0 && !conn->client->stop_now && conn->input != NULL) {
+       while (ret > 0 && conn->input != NULL) {
                T_BEGIN {
                        ret = imapc_connection_input_one(conn);
                } T_END;