0.8.11claws27

* src/imap.c
        fix imap using a tunnel command

(closes bug 87)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5cbcf02638312d506bca13a34d7e65bb4edd5f37..84dbb99d860a84ba554e1a3e5d209e8fd873ebe7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-03-18 [christoph] 0.8.11claws27
+
+       * src/imap.c
+               fix imap using a tunnel command
+
+       (closes bug 87)
+
 2003-03-18 [christoph] 0.8.11claws26
 
        * src/folder.[ch]

diff --git a/configure.ac b/configure.ac
index 9085441a3253a98aa868a770487ce3369a494892..574f63f6de1611af1566d805743fac9cd59f9037 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws27
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index cc877b3b74a728d36c161948f6b51f9fb97dc613..44dc29ba8ccc1858d5e5701af634b82eec09b796 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1700,10 +1700,11 @@ static SockInfo *imap_open_tunnel(const gchar *server,
 {
        SockInfo *sock;
 
-       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL) {
                log_warning(_("Can't establish IMAP4 session with: %s\n"),
                            server);
                return NULL;
+       }
 #if USE_OPENSSL
        return imap_init_sock(sock, ssl_type);
 #else
@@ -1764,12 +1765,6 @@ static SockInfo *imap_init_sock(SockInfo *sock)
        }
 #endif
 
-       if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
-               log_warning(_("Can't establish IMAP4 session.\n"));
-               sock_close(sock);
-               return NULL;
-       }
-
        return sock;
 }