Diffstat (limited to 'kmicromail/libmailwrapper/imapwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/imapwrapper.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp index 93fb7de..09e52b8 100644 --- a/kmicromail/libmailwrapper/imapwrapper.cpp +++ b/kmicromail/libmailwrapper/imapwrapper.cpp @@ -125,3 +125,3 @@ bool IMAPwrapper::start_tls(bool force_tls) -void IMAPwrapper::login() +void IMAPwrapper::login(bool tryTLS) // = true) { @@ -197,3 +197,3 @@ void IMAPwrapper::login() } - + if ( tryTLS ) { if (!ssl) { @@ -201,3 +201,3 @@ void IMAPwrapper::login() } - + } bool ok = true; @@ -214,2 +214,9 @@ void IMAPwrapper::login() if ( err != MAILIMAP_NO_ERROR ) { + if ( tryTLS && !force_tls && !try_tls ) { + err = mailimap_close( m_imap ); + mailimap_free( m_imap ); + m_imap = 0; + login( false ); + return; + } Global::statusMessage(i18n("error logging in imap server: %1").arg(m_imap->imap_response)); |