summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--kmicromail/accountview.cpp5
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.cpp12
-rw-r--r--kmicromail/opiemail.cpp5
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
@@ -8,2 +8,5 @@ In the search dialog you can switch now the focus from search line edit to the l
+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
@@ -115,4 +115,7 @@ void AccountView::refreshOutgoing()
}
- 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
@@ -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 );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index f68467c..197f7ec 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -145,2 +145,3 @@ void OpieMail::slotwriteMail2(const QString& namemail )
mCurrentComposer = 0;
+ folderView->refreshOutgoing();
raise();
@@ -171,2 +172,3 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
mCurrentComposer = 0;
+ folderView->refreshOutgoing();
raise();
@@ -316,2 +318,3 @@ void OpieMail::replyMail()
mCurrentComposer = 0;
+ folderView->refreshOutgoing();
delete settings;
@@ -651,2 +654,3 @@ void OpieMail::reEditMail()
compose.exec();
+ folderView->refreshOutgoing();
mCurrentComposer = 0;
@@ -669,2 +673,3 @@ void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,co
mCurrentComposer = 0;
+ folderView->refreshOutgoing();
raise();