fix IMAP port selection when using starttls

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 98ae2578cb848639d6dceb210f074b9bb0167fd6..a250e3fade1458fb6b0af4e47de527d9e5f1ffd0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-18 [colin]     0.8.10claws21
+
+       * src/imap.c
+               Fix port selection when using starttls
+
 2003-02-18 [paul]      0.8.10claws20
 
        * src/mainwindow.c

diff --git a/configure.ac b/configure.ac
index 8c9b1f970da9474defad0a7efe43ff072148a247..d7a67c2ccbcc471da1384241c628fae1c9f4f2d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index 334d1074e57b8422eea4486005f6b4966c6b23ef..480dfbe83eb017567ab1bd0101588e310214f8e1 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -500,8 +500,8 @@ Session *imap_session_new(const PrefsAccount *account)
        SSLType ssl_type;
 
        port = account->set_imapport ? account->imapport
-               : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
-       ssl_type = account->ssl_imap ? TRUE : FALSE;    
+               : account->ssl_imap == SSL_TUNNEL ? IMAPS_PORT : IMAP4_PORT;
+       ssl_type = account->ssl_imap;   
 #else
        port = account->set_imapport ? account->imapport
                : IMAP4_PORT;