summaryrefslogtreecommitdiffabout
path: root/kmicromail/libmailwrapper
Side-by-side diff
Diffstat (limited to 'kmicromail/libmailwrapper') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp12
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
@@ -42,8 +42,9 @@ SMTPwrapper::~SMTPwrapper()
void SMTPwrapper::emitQCop( int queued ) {
#ifndef DESKTOP_VERSION
- QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
- env << queued;
+ // LR : not used in kde-pim
+ //QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
+ //env << queued;
#endif
}
@@ -441,12 +442,11 @@ bool SMTPwrapper::flushOutbox() {
sendProgress->show();
sendProgress->setMaxMails(mailsToSend.count());
- while (mailsToSend.count()>0) {
+ while (returnValue && mailsToSend.count()>0) {
if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) {
QMessageBox::critical(0,i18n("Error sending mail"),
- i18n("Error sending queued mail - breaking"));
+ i18n("Error sending queued mail.\nBreaking."));
returnValue = false;
- break;
}
mailsToRemove.append((*mailsToSend.begin()));
mailsToSend.remove(mailsToSend.begin());
@@ -458,7 +458,7 @@ bool SMTPwrapper::flushOutbox() {
}
KConfig cfg( locateLocal("config", "kopiemailrc" ) );
cfg.setGroup( "Status" );
- m_queuedMail = 0;
+ m_queuedMail = mailsToSend.count();
cfg.writeEntry( "outgoing", m_queuedMail );
emit queuedMails( m_queuedMail );
sendProgress->hide();