author | zautrix <zautrix> | 2005-02-28 14:46:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-28 14:46:07 (UTC) |
commit | b1f912cbb6a9daf050e94d337de0e0e73417284a (patch) (unidiff) | |
tree | 09220df0ef11ccc32c4eafcc2a63b64056068036 /kmicromail/libmailwrapper/smtpwrapper.cpp | |
parent | ff810f8f74f6928e664bf52f8e8d128edb8ac5ad (diff) | |
download | kdepimpi-b1f912cbb6a9daf050e94d337de0e0e73417284a.zip kdepimpi-b1f912cbb6a9daf050e94d337de0e0e73417284a.tar.gz kdepimpi-b1f912cbb6a9daf050e94d337de0e0e73417284a.tar.bz2 |
ompi refresh outgoing fix
Diffstat (limited to 'kmicromail/libmailwrapper/smtpwrapper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index f54fe2b..24f4786 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -161,3 +161,3 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char* | |||
161 | QMessageBox::critical(0,i18n("Error sending mail"), | 161 | QMessageBox::critical(0,i18n("Error sending mail"), |
162 | i18n("<center>%1</center>").arg(failuremessage)); | 162 | failuremessage); |
163 | } | 163 | } |
@@ -221,3 +221,3 @@ void SMTPwrapper::connect_server() | |||
221 | if ( ssl ) { | 221 | if ( ssl ) { |
222 | ; // odebug << "SSL session" << oendl; | 222 | qDebug("smtp: ssl_connect "); |
223 | err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port ); | 223 | err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port ); |
@@ -228,4 +228,4 @@ void SMTPwrapper::connect_server() | |||
228 | if ( err != MAILSMTP_NO_ERROR ) { | 228 | if ( err != MAILSMTP_NO_ERROR ) { |
229 | ; // odebug << "Error init connection" << oendl; | 229 | qDebug("Error init SMTP connection" ); |
230 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 230 | failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); |
231 | result = 0; | 231 | result = 0; |
@@ -233,2 +233,3 @@ void SMTPwrapper::connect_server() | |||
233 | 233 | ||
234 | qDebug("SMTP connection inited "); | ||
234 | /* switch to tls after init 'cause there it will send the ehlo */ | 235 | /* switch to tls after init 'cause there it will send the ehlo */ |
@@ -238,7 +239,8 @@ void SMTPwrapper::connect_server() | |||
238 | result = 0; | 239 | result = 0; |
239 | failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err)); | 240 | qDebug("Error init SMTP connection "); |
241 | failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err)); | ||
240 | } | 242 | } |
241 | } | 243 | } |
242 | |||
243 | if (try_tls) { | 244 | if (try_tls) { |
245 | qDebug("Smpt: Try tls "); | ||
244 | err = start_smtp_tls(); | 246 | err = start_smtp_tls(); |
@@ -246,2 +248,3 @@ void SMTPwrapper::connect_server() | |||
246 | try_tls = false; | 248 | try_tls = false; |
249 | qDebug("no tls "); | ||
247 | } else { | 250 | } else { |
@@ -250,6 +253,6 @@ void SMTPwrapper::connect_server() | |||
250 | } | 253 | } |
251 | 254 | //qDebug("mailesmtp_ehlo %d ",err ); | |
252 | if (!try_tls && force_tls) { | 255 | if (!try_tls && force_tls) { |
253 | result = 0; | 256 | result = 0; |
254 | failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err)); | 257 | failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err)); |
255 | } | 258 | } |
@@ -269,3 +272,3 @@ void SMTPwrapper::connect_server() | |||
269 | result = 0; | 272 | result = 0; |
270 | failuretext=i18n("Login aborted - storing mail to localfolder"); | 273 | failuretext=i18n("Login aborted - \nstoring mail to localfolder"); |
271 | } | 274 | } |
@@ -279,3 +282,3 @@ void SMTPwrapper::connect_server() | |||
279 | if ( err == MAILSMTP_NO_ERROR ) { | 282 | if ( err == MAILSMTP_NO_ERROR ) { |
280 | ; // odebug << "auth ok" << oendl; | 283 | qDebug("Smtp authentification ok "); |
281 | } else { | 284 | } else { |
@@ -308,3 +311,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
308 | if ( err != MAILSMTP_NO_ERROR ) { | 311 | if ( err != MAILSMTP_NO_ERROR ) { |
309 | failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err)); | 312 | qDebug("Error sending mail"); |
313 | failuretext=i18n("Error sending mail:\n%1").arg(mailsmtpError(err)); | ||
310 | result = 0; | 314 | result = 0; |