mail fix

4 files changed, 18 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index dc22fc6..a9b6c87 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,4 +7,7 @@ Fixed a problem in the addressee select dialog and made it more user friendly by
 In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".  
 
+OM/Pi:
+Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails.
+
 ********** VERSION 2.0.12 ************
 
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 3ad3e9b..e9be224 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -114,6 +114,9 @@ void AccountView::refreshOutgoing()
         bName.replace(0,pos+1,"");
     }
-    if ( bName.lower() == "outgoing" )
+    //qDebug("name *%s* ",bName.lower().latin1() );
+    if ( bName.lower() == "outgoing" || bName.lower() == "sent" ||  bName.lower() == "sendfailed" ) {
         refreshCurrent();
+        // qDebug("refresh ");
+    }
 }
 
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
@@ -43,6 +43,7 @@ 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
 }
@@ -442,10 +443,9 @@ bool SMTPwrapper::flushOutbox() {
     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()));
@@ -459,5 +459,5 @@ 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 );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index f68467c..197f7ec 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -144,4 +144,5 @@ void OpieMail::slotwriteMail2(const QString& namemail )
     compose.exec();
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     raise();
     //qDebug("retttich ");
@@ -170,4 +171,5 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
     compose.exec();
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     raise();
 }
@@ -315,4 +317,5 @@ void OpieMail::replyMail()
     }
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     delete settings;
 
@@ -650,4 +653,5 @@ void OpieMail::reEditMail()
     mCurrentComposer = &compose;
     compose.exec();
+    folderView->refreshOutgoing();
     mCurrentComposer = 0;
 }
@@ -668,4 +672,5 @@ void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,co
         compose.exec();
         mCurrentComposer = 0;
+        folderView->refreshOutgoing();
         raise();
     }