summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-16 15:51:58 (UTC)
committer zautrix <zautrix>2005-03-16 15:51:58 (UTC)
commitfcfb235c813d3cfcf23ab905fe2fb159647bc911 (patch) (side-by-side diff)
tree424721fc576e2b41ea22274e792e977fb54e52c4
parentb90787b3fd6cf859c80ddce0f1a2272c7565eec3 (diff)
downloadkdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.zip
kdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.tar.gz
kdepimpi-fcfb235c813d3cfcf23ab905fe2fb159647bc911.tar.bz2
smtp fix
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp3
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp7
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
@@ -184,6 +184,9 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
Global::statusMessage(i18n("There are no new messages"));
return;
}
+ Global::statusMessage(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
+ qDebug(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
+ qApp->processEvents();
QValueList<RecMailP> e;
targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
//qDebug("target has mails %d ", e.count());
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
@@ -206,6 +206,7 @@ void SMTPwrapper::connect_server()
try_tls = false;
} else if (m_SmtpAccount->ConnectionType() == 2) {
force_tls = true;
+ try_tls = true;
} else if (m_SmtpAccount->ConnectionType() == 1) {
try_tls = true;
}
@@ -245,15 +246,17 @@ void SMTPwrapper::connect_server()
}
}
if (result && try_tls) {
- qDebug("Smpt: Try tls ");
+ qDebug("Smpt: Try TLS... ");
err = start_smtp_tls();
if (err != MAILSMTP_NO_ERROR) {
try_tls = false;
- qDebug("no tls ");
+ qDebug("Smpt: No TLS possible ");
} else {
err = mailesmtp_ehlo(m_smtp);
if ( err != MAILSMTP_NO_ERROR )
result = 0;
+ else
+ qDebug("Smpt: Using TLS ");
}
}
//qDebug("mailesmtp_ehlo %d ",err );