better error handling

3 files changed, 25 insertions, 16 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 2c2e279..ca4f247 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -120,9 +120,9 @@ void ComposeMail::saveAsDraft()
         wrapper.storeMail(mail);
 
         AttachViewItem *it = (AttachViewItem *) attList->firstChild();
         /* attachments we will ignore! */
-        if ( it != NULL ) {
+        if ( it != 0 ) {
             if ( warnAttach )
             QMessageBox::warning(0,tr("Store message"),
                 tr("<center>Attachments will not be stored in \"Draft\" folder</center>"));
             warnAttach = false;
@@ -135,9 +135,9 @@ void  ComposeMail::clearStatus()
 }
 void  ComposeMail::setStatus( QString status )
 {
     topLevelWidget()->setCaption( status );
-    QTimer::singleShot ( 5000, this, SLOT( clearStatus() ) ) ;
+    QTimer::singleShot ( 10000, this, SLOT( clearStatus() ) ) ;
 }
 void ComposeMail::pickAddress( QLineEdit *line )
 {
     //qDebug(" ComposeMail::pickAddress ");
@@ -299,15 +299,21 @@ void ComposeMail::accept()
         txt.append( sigMultiLine->text() );
     }
     mail->setMessage( txt );
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
-    while ( it != NULL ) {
+    while ( it != 0 ) {
         mail->addAttachment( it->getAttachment() );
         it = (AttachViewItem *) it->nextSibling();
     }
 
     SMTPwrapper wrapper( smtp );
-    wrapper.sendMail( mail,checkBoxLater->isChecked() );
+    if ( wrapper.sendMail( mail,checkBoxLater->isChecked() ) )
+        setStatus( tr ("Mail sent"));
+    else {
+        setStatus( tr ("Error: Something went wrong. Nothing sent"));
+        return;
+    }
+        
 
     QDialog::accept();
 }
 
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 04a21ea..6a1b505 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -101,9 +101,9 @@ void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box) {
     wrap->storeMessage(mail,length,box);
     delete wrap;
 }
 
-void SMTPwrapper::smtpSend( mailmime *mail,bool later) {
+bool SMTPwrapper::smtpSend( mailmime *mail,bool later) {
     clist *rcpts = 0;
     char *from, *data;
     size_t size;
 
@@ -117,10 +117,10 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) {
     mailmessage_free(msg);
     if (r != MAIL_NO_ERROR || !data) {
         if (data)
             free(data);
-        ; // odebug << "Error fetching mime..." << oendl; 
-        return;
+        qDebug("Error fetching mime... ");
+        return false;
     }
     msg = 0;
     if (later) {
         storeMail(data,size,"Outgoing");
@@ -129,21 +129,22 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later) {
         Config cfg( "mail" );
         cfg.setGroup( "Status" );
         cfg.writeEntry( "outgoing", ++m_queuedMail );
         emit queuedMails( m_queuedMail );
-        return;
+        return true;
     }
     from = getFrom( mail );
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
-    smtpSend(from,rcpts,data,size);
+    bool result = smtpSend(from,rcpts,data,size);
     if (data) {
         free(data);
     }
     if (from) {
         free(from);
     }
     if (rcpts)
         smtp_address_list_free( rcpts );
+    return result;
 }
 
 void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage)
 {
@@ -315,26 +316,28 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
     }
     return result;
 }
 
-void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later )
+bool SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later )
 {
     mailmime * mimeMail;
-
+    bool result = true;
     mimeMail = createMimeMail(mail );
-    if ( mimeMail == NULL ) {
-        ; // odebug << "sendMail: error creating mime mail" << oendl; 
+    if ( mimeMail == 0 ) {
+        qDebug("SMTP wrapper:Error creating mail! ");
+        return false;
     } else {
         sendProgress = new progressMailSend();
         sendProgress->show();
         sendProgress->setMaxMails(1);
-        smtpSend( mimeMail,later);
+        result = smtpSend( mimeMail,later);
         ; // odebug << "Clean up done" << oendl; 
         sendProgress->hide();
         delete sendProgress;
         sendProgress = 0;
         mailmime_free( mimeMail );
     }
+    return result;
 }
 
 int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) {
     size_t curTok = 0;
diff --git a/kmicromail/libmailwrapper/smtpwrapper.h b/kmicromail/libmailwrapper/smtpwrapper.h
index 6c5bbe8..105cbf5 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.h
+++ b/kmicromail/libmailwrapper/smtpwrapper.h
@@ -22,9 +22,9 @@ class SMTPwrapper : public Generatemail
 
 public:
     SMTPwrapper(SMTPaccount * aSmtp);
     virtual ~SMTPwrapper();
-    void sendMail(const Opie::Core::OSmartPointer<Mail>& mail,bool later=false );
+    bool sendMail(const Opie::Core::OSmartPointer<Mail>& mail,bool later=false );
     bool flushOutbox();
 
     static progressMailSend*sendProgress;
 
@@ -39,9 +39,9 @@ protected:
     void disc_server();
     int start_smtp_tls();
 
 
-    void smtpSend( mailmime *mail,bool later);
+    bool smtpSend( mailmime *mail,bool later);
 
     static void storeMail(const char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static void progress( size_t current, size_t maximum );