sync with 0.8.11cvs6

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index 44dc29ba8ccc1858d5e5701af634b82eec09b796..c8dfd712cdbd6af830020141c63a405c7204de1d 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -559,8 +559,6 @@ Session *imap_session_new(const PrefsAccount *account)
        SESSION(session)->type             = SESSION_IMAP;
        SESSION(session)->server           = g_strdup(account->recv_server);
        SESSION(session)->sock             = imap_sock;
-       SESSION(session)->connected        = TRUE;
-       SESSION(session)->phase            = SESSION_READY;
        SESSION(session)->last_access_time = time(NULL);
        SESSION(session)->data             = NULL;
 
@@ -2971,7 +2969,7 @@ static void imap_cmd_gen_send(SockInfo *sock, const gchar *format, ...)
        } else
                log_print("IMAP4> %d %s\n", imap_cmd_count, tmp);
 
-       sock_write(sock, buf, strlen(buf));
+       sock_write_all(sock, buf, strlen(buf));
 }
 
 static gint imap_cmd_gen_recv(SockInfo *sock, gchar **buf)