2 files changed, 24 insertions, 1 deletions

diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 085d5e4..7671133 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,20 +1,21 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
+#include <qmessagebox.h>
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 //#include "defines.h"
@@ -545,24 +546,35 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp ) {
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
     smtpSend(from,rcpts,data,size,smtp);
     if (data) {
         free(data);
     }
     if (from) {
         free(from);
     }
     if (rcpts)
         smtp_address_list_free( rcpts );
 }
 
+void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*failuremessage)
+{
+    if (data) {
+        storeMail(data,size,"Sendfailed");
+    }
+    if (failuremessage) {
+        QMessageBox::critical(0,tr("Error sending mail"),
+            tr("<center>%1</center>").arg(failuremessage));
+    }
+}
+
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp ) {
     const char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
 
     result = 1;
     server = user = pass = 0;
     server = smtp->getServer().latin1();
 
     // FIXME: currently only TLS and Plain work.
@@ -580,30 +592,32 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
         goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {
         qDebug("Error init connection");
+        storeFailedMail(data,size,mailsmtpError(err));
         result = 0;
         goto free_mem_session;
     }
 
     err = mailsmtp_init( session );
     if ( err != MAILSMTP_NO_ERROR ) {
+        storeFailedMail(data,size,mailsmtpError(err));
         result = 0;
         goto free_con_session;
     }
 
     qDebug( "INIT OK" );
 
     if ( smtp->getLogin() ) {
         qDebug("smtp with auth");
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
@@ -612,33 +626,41 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMT
                 user = login.getUser().latin1();
                 pass = login.getPassword().latin1();
             } else {
                 result = 0;
                 goto free_con_session;
             }
         } else {
             user = smtp->getUser().latin1();
             pass = smtp->getPassword().latin1();
         }
         qDebug( "session->auth: %i", session->auth);
         err = mailsmtp_auth( session, (char*)user, (char*)pass );
-        if ( err == MAILSMTP_NO_ERROR )
+        if ( err == MAILSMTP_NO_ERROR ) {
             qDebug("auth ok");
+        } else {
+            storeFailedMail(data,size,tr("Authentification failed"));
+            result = 0;
+            goto free_con_session;
+        }
         qDebug( "Done auth!" );
     } else {
         qDebug("SMTP without auth");
+        result = 0;
+        goto free_con_session;
     }
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) {
+        storeFailedMail(data,size,mailsmtpError(err));
         qDebug("Error sending mail: %s",mailsmtpError(err).latin1());
         result = 0;
         goto free_con_session;
     }
 
     qDebug( "Mail sent." );
     storeMail(data,size,"Sent");
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 7dcdbfd..89826d9 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -51,22 +51,23 @@ protected:
     static QString mailsmtpError( int err );
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
     int smtpSend(char*from,clist*rcpts,const char*data,size_t size, SMTPaccount *smtp );
 
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
     
     int sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which);
+    void storeFailedMail(const char*data,unsigned int size, const char*failuremessage);
 
     int m_queuedMail;
     static const char* USER_AGENT;
 
 protected slots:
    void emitQCop( int queued );
 
 };
 
 #endif