author | harlekin <harlekin> | 2003-12-24 10:52:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-24 10:52:13 (UTC) |
commit | d128e2686193fb52bad638317e6f29a1b75a1db4 (patch) (side-by-side diff) | |
tree | c53199fd367577dd0a7ac43e9fad293e92de2607 | |
parent | ff20f6d33cffd84222029df9f118a9e5db5ec3e5 (diff) | |
download | opie-d128e2686193fb52bad638317e6f29a1b75a1db4.zip opie-d128e2686193fb52bad638317e6f29a1b75a1db4.tar.gz opie-d128e2686193fb52bad638317e6f29a1b75a1db4.tar.bz2 |
only show the mail queue flushed dialogbox when successfull -)
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.cpp | 15 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/smtpwrapper.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 3 | ||||
-rw-r--r-- | noncore/net/mail/smtpwrapper.cpp | 15 | ||||
-rw-r--r-- | noncore/net/mail/smtpwrapper.h | 2 |
5 files changed, 26 insertions, 11 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index 770e2b8..a7e4837 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp @@ -695,14 +695,17 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which) } /* this is a special fun */ -void SMTPwrapper::flushOutbox(SMTPaccount*smtp) +bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) { - if (!smtp) return; + bool returnValue = true; + + if (!smtp) return false; + QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/"); MBOXwrapper*wrap = new MBOXwrapper(localfolders); if (!wrap) { qDebug("memory error"); - return; + return false; } QList<RecMail> mailsToSend; QList<RecMail> mailsToRemove; @@ -710,7 +713,7 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) wrap->listMessages(mbox,mailsToSend); if (mailsToSend.count()==0) { delete wrap; - return; + return false; } mailsToSend.setAutoDelete(false); sendProgress = new progressMailSend(); @@ -722,6 +725,8 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) { QMessageBox::critical(0,tr("Error sending mail"), tr("Error sending queued mail - breaking")); + + returnValue = false; break; } mailsToRemove.append(mailsToSend.at(0)); @@ -734,4 +739,6 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) wrap->deleteMails(mbox,mailsToRemove); mailsToSend.setAutoDelete(true); delete wrap; + return returnValue; + } diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h index baa353b..66180b7 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.h +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h @@ -28,7 +28,7 @@ public: SMTPwrapper( Settings *s ); virtual ~SMTPwrapper(){} void sendMail(const Mail& mail,bool later=false ); - void flushOutbox(SMTPaccount*smtp); + bool flushOutbox(SMTPaccount*smtp); static progressMailSend*sendProgress; protected: diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 833cac2..0dede90 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp @@ -68,10 +68,11 @@ void OpieMail::slotSendQueued() // } if (smtp) { SMTPwrapper * wrap = new SMTPwrapper(settings); - wrap->flushOutbox(smtp); + if ( wrap->flushOutbox(smtp) ) { QMessageBox::information(0,tr("Info"),tr("Mail queue flushed")); } } +} void OpieMail::slotSearchMails() { diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp index 770e2b8..a7e4837 100644 --- a/noncore/net/mail/smtpwrapper.cpp +++ b/noncore/net/mail/smtpwrapper.cpp @@ -695,14 +695,17 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which) } /* this is a special fun */ -void SMTPwrapper::flushOutbox(SMTPaccount*smtp) +bool SMTPwrapper::flushOutbox(SMTPaccount*smtp) { - if (!smtp) return; + bool returnValue = true; + + if (!smtp) return false; + QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/"); MBOXwrapper*wrap = new MBOXwrapper(localfolders); if (!wrap) { qDebug("memory error"); - return; + return false; } QList<RecMail> mailsToSend; QList<RecMail> mailsToRemove; @@ -710,7 +713,7 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) wrap->listMessages(mbox,mailsToSend); if (mailsToSend.count()==0) { delete wrap; - return; + return false; } mailsToSend.setAutoDelete(false); sendProgress = new progressMailSend(); @@ -722,6 +725,8 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) { QMessageBox::critical(0,tr("Error sending mail"), tr("Error sending queued mail - breaking")); + + returnValue = false; break; } mailsToRemove.append(mailsToSend.at(0)); @@ -734,4 +739,6 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp) wrap->deleteMails(mbox,mailsToRemove); mailsToSend.setAutoDelete(true); delete wrap; + return returnValue; + } diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h index baa353b..66180b7 100644 --- a/noncore/net/mail/smtpwrapper.h +++ b/noncore/net/mail/smtpwrapper.h @@ -28,7 +28,7 @@ public: SMTPwrapper( Settings *s ); virtual ~SMTPwrapper(){} void sendMail(const Mail& mail,bool later=false ); - void flushOutbox(SMTPaccount*smtp); + bool flushOutbox(SMTPaccount*smtp); static progressMailSend*sendProgress; protected: |