ompi refresh outgoing fix

1 files changed, 15 insertions, 11 deletions

diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index f54fe2b..24f4786 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -161,3 +161,3 @@ void SMTPwrapper::storeFailedMail(const char*data,unsigned int size, const char*
         QMessageBox::critical(0,i18n("Error sending mail"),
-            i18n("<center>%1</center>").arg(failuremessage));
+            failuremessage);
     }
@@ -221,3 +221,3 @@ void SMTPwrapper::connect_server()
     if ( ssl ) {
-        ; // odebug << "SSL session" << oendl; 
+        qDebug("smtp: ssl_connect ");
         err = mailsmtp_ssl_connect( m_smtp, server.latin1(), port );
@@ -228,4 +228,4 @@ void SMTPwrapper::connect_server()
     if ( err != MAILSMTP_NO_ERROR ) {
-        ; // odebug << "Error init connection" << oendl; 
-        failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
+        qDebug("Error init SMTP connection" );
+        failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err));
         result = 0;
@@ -233,2 +233,3 @@ void SMTPwrapper::connect_server()
 
+    qDebug("SMTP connection inited ");
     /* switch to tls after init 'cause there it will send the ehlo */
@@ -238,7 +239,8 @@ void SMTPwrapper::connect_server()
             result = 0;
-            failuretext = i18n("Error init SMTP connection: %1").arg(mailsmtpError(err));
+            qDebug("Error init SMTP connection ");
+            failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err));
         }
     }
-
     if (try_tls) {
+        qDebug("Smpt: Try tls ");
         err = start_smtp_tls();
@@ -246,2 +248,3 @@ void SMTPwrapper::connect_server()
             try_tls = false;
+            qDebug("no tls ");
         } else {
@@ -250,6 +253,6 @@ void SMTPwrapper::connect_server()
     }
-
+    //qDebug("mailesmtp_ehlo %d ",err );
     if (!try_tls && force_tls) {
         result = 0;
-        failuretext = i18n("Error init SMTP tls: %1").arg(mailsmtpError(err));
+        failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err));
     }
@@ -269,3 +272,3 @@ void SMTPwrapper::connect_server()
                 result = 0;
-                failuretext=i18n("Login aborted - storing mail to localfolder");
+                failuretext=i18n("Login aborted - \nstoring mail to localfolder");
             }
@@ -279,3 +282,3 @@ void SMTPwrapper::connect_server()
             if ( err == MAILSMTP_NO_ERROR ) {
-                ; // odebug << "auth ok" << oendl; 
+                qDebug("Smtp authentification ok ");
             } else {
@@ -308,3 +311,4 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size )
         if ( err != MAILSMTP_NO_ERROR ) {
-            failuretext=i18n("Error sending mail: %1").arg(mailsmtpError(err));
+            qDebug("Error sending mail");
+            failuretext=i18n("Error sending mail:\n%1").arg(mailsmtpError(err));
             result = 0;