author | zautrix <zautrix> | 2005-03-16 15:51:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-16 15:51:58 (UTC) |
commit | fcfb235c813d3cfcf23ab905fe2fb159647bc911 (patch) (unidiff) | |
tree | 424721fc576e2b41ea22274e792e977fb54e52c4 | |
parent | b90787b3fd6cf859c80ddce0f1a2272c7565eec3 (diff) | |
download | kdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.zip kdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.tar.gz kdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.tar.bz2 |
smtp fix
-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 3 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index ed5c898..870985e 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -185,4 +185,7 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
185 | return; | 185 | return; |
186 | } | 186 | } |
187 | Global::statusMessage(i18n("%1 :Downloading mails..."). arg(acc->getAccountName())); | ||
188 | qDebug(i18n("%1 :Downloading mails..."). arg(acc->getAccountName())); | ||
189 | qApp->processEvents(); | ||
187 | QValueList<RecMailP> e; | 190 | QValueList<RecMailP> e; |
188 | targetMail->listMessages(lfName,e,acc->getMaxMailSize() ); | 191 | targetMail->listMessages(lfName,e,acc->getMaxMailSize() ); |
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index 845c71c..448a2e9 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -207,4 +207,5 @@ void SMTPwrapper::connect_server() | |||
207 | } else if (m_SmtpAccount->ConnectionType() == 2) { | 207 | } else if (m_SmtpAccount->ConnectionType() == 2) { |
208 | force_tls = true; | 208 | force_tls = true; |
209 | try_tls = true; | ||
209 | } else if (m_SmtpAccount->ConnectionType() == 1) { | 210 | } else if (m_SmtpAccount->ConnectionType() == 1) { |
210 | try_tls = true; | 211 | try_tls = true; |
@@ -246,13 +247,15 @@ void SMTPwrapper::connect_server() | |||
246 | } | 247 | } |
247 | if (result && try_tls) { | 248 | if (result && try_tls) { |
248 | qDebug("Smpt: Try tls "); | 249 | qDebug("Smpt: Try TLS... "); |
249 | err = start_smtp_tls(); | 250 | err = start_smtp_tls(); |
250 | if (err != MAILSMTP_NO_ERROR) { | 251 | if (err != MAILSMTP_NO_ERROR) { |
251 | try_tls = false; | 252 | try_tls = false; |
252 | qDebug("no tls "); | 253 | qDebug("Smpt: No TLS possible "); |
253 | } else { | 254 | } else { |
254 | err = mailesmtp_ehlo(m_smtp); | 255 | err = mailesmtp_ehlo(m_smtp); |
255 | if ( err != MAILSMTP_NO_ERROR ) | 256 | if ( err != MAILSMTP_NO_ERROR ) |
256 | result = 0; | 257 | result = 0; |
258 | else | ||
259 | qDebug("Smpt: Using TLS "); | ||
257 | } | 260 | } |
258 | } | 261 | } |