fixed a bug within tls support

1 files changed, 6 insertions, 4 deletions

diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 8e5212b..576804d 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -72,11 +72,13 @@ bool IMAPwrapper::start_tls(bool force_tls)
         mailimap_capability_data_free(cap_data);
     }
     if (try_tls) {
         err =  mailimap_starttls(m_imap);
-        if (err != MAILIMAP_NO_ERROR && force_tls) {
-            Global::statusMessage(tr("Server has no TLS support!"));
-            odebug << "Server has no TLS support!" << oendl;
+        if (err != MAILIMAP_NO_ERROR) {
+            if (force_tls) {
+                Global::statusMessage(tr("Server has no TLS support!"));
+                odebug << "Server has no TLS support!" << oendl;
+            }
             try_tls = false;
         } else {
             mailstream_low * low;
             mailstream_low * new_low;
@@ -184,9 +186,9 @@ void IMAPwrapper::login()
 
     /* login */
 
     if (ok) {
-        err = mailimap_login_simple( m_imap, (char*)user, (char*)pass );
+        err = mailimap_login( m_imap, (char*)user, (char*)pass );
         if ( err != MAILIMAP_NO_ERROR ) {
             Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
             ok = false;
         }