quick fix for martin's omission of a account specific setting. imap over ssh tunnel...
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 22 Dec 2001 19:14:48 +0000 (19:14 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 22 Dec 2001 19:14:48 +0000 (19:14 +0000)
ChangeLog.claws
configure.in
src/imap.c

index c12a7a2ac43a0fcc70a0ef5e4bfc977771b8c098..f3da5ed095d525eca8059784b01284daa7accc71 100644 (file)
@@ -1,3 +1,9 @@
+2001-12-22 [alfons]    0.6.6claws10
+
+       * src/imap.c
+               quick fix for Martin Pool's omission of an account
+               specific SSL setting
+
 2001-12-22 [alfons]    0.6.6claws9
 
        * src/compose.c
index f4fb881c3068d814a4c884367362f1ba0d279e7b..1d79d8312824194a1d78f10023a5d89d14bec186 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws10
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
index b7737f81b5772353aa81f78392c12c293d860f81..68f5dc58e96bede209cfea8d3cb52cf22530a8bd 100644 (file)
@@ -331,8 +331,12 @@ Session *imap_session_new(const PrefsAccount *account)
        gboolean is_preauth;
 
 #ifdef USE_SSL
+       /* FIXME: IMAP over SSL only... */ 
+       gboolean use_ssl;
+
        port = account->set_imapport ? account->imapport
                : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+       use_ssl = account->ssl_imap ? TRUE : FALSE;     
 #else
        port = account->set_imapport ? account->imapport
                : IMAP4_PORT;
@@ -351,7 +355,7 @@ Session *imap_session_new(const PrefsAccount *account)
                
 #if USE_SSL
                if ((imap_sock = imap_open(account->recv_server, port,
-                                          account->use_ssl)) == NULL)
+                                          use_ssl)) == NULL)
 #else
                if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
 #endif