mail fix

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
@@ -44,4 +44,5 @@ 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
@@ -443,8 +444,7 @@ bool SMTPwrapper::flushOutbox() {
 
-    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;
         }
@@ -460,3 +460,3 @@ bool SMTPwrapper::flushOutbox() {
     cfg.setGroup( "Status" );
-    m_queuedMail = 0;
+    m_queuedMail = mailsToSend.count();
     cfg.writeEntry( "outgoing", m_queuedMail );