quick fix for martin's omission of a account specific setting. imap over ssh tunnel...

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index b7737f81b5772353aa81f78392c12c293d860f81..68f5dc58e96bede209cfea8d3cb52cf22530a8bd 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -331,8 +331,12 @@ Session *imap_session_new(const PrefsAccount *account)
        gboolean is_preauth;
 
 #ifdef USE_SSL
        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;
        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;
 #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,
                
 #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
 #else
                if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
 #endif