5 files changed, 59 insertions, 44 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
@@ -219,5 +219,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
 
     int pos = filename.findRev( '/' );
-    
+
     if (filename.length()>0) {
         QString tmp = filename.right( filename.length() - ( pos + 1 ) );
@@ -229,8 +229,8 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
-    
+
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );                                   
+                                        strdup( "iso-8859-1" ) );
         disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
@@ -251,5 +251,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
             clist_append(content->ct_parameters,param);
             param = 0;
-        }            
+        }
         filePart = mailmime_new_empty( content, fields );
     }
@@ -549,5 +549,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     }
     from = data = 0;
-    
+
     QString file = getTmpFile();
     writeToFile( file, mail );
@@ -555,5 +555,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     QFile f( file );
     f.remove();
-    
+
     if (later) {
         storeMail(data,size,"Outgoing");
@@ -573,5 +573,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou
     mailsmtp *session;
     int err,result;
-    
+
     result = 1;
     server = user = pass = 0;
@@ -579,5 +579,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
-    
+
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
@@ -645,7 +645,7 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
     mailmime * mimeMail;
-    
+
     SMTPaccount *smtp = getAccount(mail.getName());
-    
+
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
@@ -653,5 +653,5 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
     } else {
         sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
         sendProgress->show();
         sendProgress->setMaxMails(1);
@@ -677,5 +677,5 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
-    int err = mailimf_fields_parse( data, length, &curTok, &fields );    
+    int err = mailimf_fields_parse( data, length, &curTok, &fields );
     if (err != MAILIMF_NO_ERROR) {
         free(data);
@@ -683,9 +683,9 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
         return 0;
     }
-    
+
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
-    
+
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
@@ -696,12 +696,15 @@ 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;
-    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    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;
@@ -711,9 +714,9 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     if (mailsToSend.count()==0) {
         delete wrap;
-        return;
+        return false;
     }
     mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
    sendProgress->show();
    sendProgress->setMaxMails(mailsToSend.count());
@@ -723,4 +726,6 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
+
+            returnValue = false;
             break;
         }
@@ -735,3 +740,5 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     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
@@ -29,5 +29,5 @@ public:
     virtual ~SMTPwrapper(){}
     void sendMail(const Mail& mail,bool later=false );
-    void flushOutbox(SMTPaccount*smtp);
+    bool flushOutbox(SMTPaccount*smtp);
 
     static progressMailSend*sendProgress;
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
@@ -69,6 +69,7 @@ void OpieMail::slotSendQueued()
     if (smtp) {
         SMTPwrapper * wrap = new SMTPwrapper(settings);
-        wrap->flushOutbox(smtp);
-        QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
+        if ( wrap->flushOutbox(smtp) ) {
+            QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
+        }
     }
 }
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
@@ -219,5 +219,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
 
     int pos = filename.findRev( '/' );
-    
+
     if (filename.length()>0) {
         QString tmp = filename.right( filename.length() - ( pos + 1 ) );
@@ -229,8 +229,8 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
     int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
     int mechanism = MAILMIME_MECHANISM_BASE64;
-    
+
     if ( mimetype.startsWith( "text/" ) ) {
         param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );                                   
+                                        strdup( "iso-8859-1" ) );
         disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
         mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
@@ -251,5 +251,5 @@ mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimety
             clist_append(content->ct_parameters,param);
             param = 0;
-        }            
+        }
         filePart = mailmime_new_empty( content, fields );
     }
@@ -549,5 +549,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     }
     from = data = 0;
-    
+
     QString file = getTmpFile();
     writeToFile( file, mail );
@@ -555,5 +555,5 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
     QFile f( file );
     f.remove();
-    
+
     if (later) {
         storeMail(data,size,"Outgoing");
@@ -573,5 +573,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou
     mailsmtp *session;
     int err,result;
-    
+
     result = 1;
     server = user = pass = 0;
@@ -579,5 +579,5 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccou
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
-    
+
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
@@ -645,7 +645,7 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
     mailmime * mimeMail;
-    
+
     SMTPaccount *smtp = getAccount(mail.getName());
-    
+
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
@@ -653,5 +653,5 @@ void SMTPwrapper::sendMail(const Mail&mail,bool later )
     } else {
         sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
         sendProgress->show();
         sendProgress->setMaxMails(1);
@@ -677,5 +677,5 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
-    int err = mailimf_fields_parse( data, length, &curTok, &fields );    
+    int err = mailimf_fields_parse( data, length, &curTok, &fields );
     if (err != MAILIMF_NO_ERROR) {
         free(data);
@@ -683,9 +683,9 @@ int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
         return 0;
     }
-    
+
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
-    
+
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
@@ -696,12 +696,15 @@ 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;
-    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    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;
@@ -711,9 +714,9 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     if (mailsToSend.count()==0) {
         delete wrap;
-        return;
+        return false;
     }
     mailsToSend.setAutoDelete(false);
     sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
    sendProgress->show();
    sendProgress->setMaxMails(mailsToSend.count());
@@ -723,4 +726,6 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
+
+            returnValue = false;
             break;
         }
@@ -735,3 +740,5 @@ void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
     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
@@ -29,5 +29,5 @@ public:
     virtual ~SMTPwrapper(){}
     void sendMail(const Mail& mail,bool later=false );
-    void flushOutbox(SMTPaccount*smtp);
+    bool flushOutbox(SMTPaccount*smtp);
 
     static progressMailSend*sendProgress;