-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index 24f4786..5096f67 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp | |||
@@ -37,18 +37,19 @@ SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | |||
37 | 37 | ||
38 | SMTPwrapper::~SMTPwrapper() | 38 | SMTPwrapper::~SMTPwrapper() |
39 | { | 39 | { |
40 | disc_server(); | 40 | disc_server(); |
41 | } | 41 | } |
42 | 42 | ||
43 | void SMTPwrapper::emitQCop( int queued ) { | 43 | void SMTPwrapper::emitQCop( int queued ) { |
44 | #ifndef DESKTOP_VERSION | 44 | #ifndef DESKTOP_VERSION |
45 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); | 45 | // LR : not used in kde-pim |
46 | env << queued; | 46 | //QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); |
47 | //env << queued; | ||
47 | #endif | 48 | #endif |
48 | } | 49 | } |
49 | 50 | ||
50 | QString SMTPwrapper::mailsmtpError( int errnum ) { | 51 | QString SMTPwrapper::mailsmtpError( int errnum ) { |
51 | switch ( errnum ) { | 52 | switch ( errnum ) { |
52 | case MAILSMTP_NO_ERROR: | 53 | case MAILSMTP_NO_ERROR: |
53 | return i18n( "No error" ); | 54 | return i18n( "No error" ); |
54 | case MAILSMTP_ERROR_UNEXPECTED_CODE: | 55 | case MAILSMTP_ERROR_UNEXPECTED_CODE: |
@@ -436,34 +437,33 @@ bool SMTPwrapper::flushOutbox() { | |||
436 | } | 437 | } |
437 | } | 438 | } |
438 | 439 | ||
439 | 440 | ||
440 | sendProgress = new progressMailSend(); | 441 | sendProgress = new progressMailSend(); |
441 | sendProgress->show(); | 442 | sendProgress->show(); |
442 | sendProgress->setMaxMails(mailsToSend.count()); | 443 | sendProgress->setMaxMails(mailsToSend.count()); |
443 | 444 | ||
444 | while (mailsToSend.count()>0) { | 445 | while (returnValue && mailsToSend.count()>0) { |
445 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { | 446 | if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) { |
446 | QMessageBox::critical(0,i18n("Error sending mail"), | 447 | QMessageBox::critical(0,i18n("Error sending mail"), |
447 | i18n("Error sending queued mail - breaking")); | 448 | i18n("Error sending queued mail.\nBreaking.")); |
448 | returnValue = false; | 449 | returnValue = false; |
449 | break; | ||
450 | } | 450 | } |
451 | mailsToRemove.append((*mailsToSend.begin())); | 451 | mailsToRemove.append((*mailsToSend.begin())); |
452 | mailsToSend.remove(mailsToSend.begin()); | 452 | mailsToSend.remove(mailsToSend.begin()); |
453 | sendProgress->setCurrentMails(mailsToRemove.count()); | 453 | sendProgress->setCurrentMails(mailsToRemove.count()); |
454 | } | 454 | } |
455 | if (reset_user_value) { | 455 | if (reset_user_value) { |
456 | m_SmtpAccount->setUser(oldUser); | 456 | m_SmtpAccount->setUser(oldUser); |
457 | m_SmtpAccount->setPassword(oldPw); | 457 | m_SmtpAccount->setPassword(oldPw); |
458 | } | 458 | } |
459 | KConfig cfg( locateLocal("config", "kopiemailrc" ) ); | 459 | KConfig cfg( locateLocal("config", "kopiemailrc" ) ); |
460 | cfg.setGroup( "Status" ); | 460 | cfg.setGroup( "Status" ); |
461 | m_queuedMail = 0; | 461 | m_queuedMail = mailsToSend.count(); |
462 | cfg.writeEntry( "outgoing", m_queuedMail ); | 462 | cfg.writeEntry( "outgoing", m_queuedMail ); |
463 | emit queuedMails( m_queuedMail ); | 463 | emit queuedMails( m_queuedMail ); |
464 | sendProgress->hide(); | 464 | sendProgress->hide(); |
465 | delete sendProgress; | 465 | delete sendProgress; |
466 | sendProgress = 0; | 466 | sendProgress = 0; |
467 | wrap->deleteMails(mbox,mailsToRemove); | 467 | wrap->deleteMails(mbox,mailsToRemove); |
468 | delete wrap; | 468 | delete wrap; |
469 | return returnValue; | 469 | return returnValue; |