patch from wim delvaux. fix from me

1 files changed, 21 insertions, 14 deletions

diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/net/mailit/smtpclient.cpp
+++ b/noncore/net/mailit/smtpclient.cpp
@@ -75,3 +75,8 @@ void SmtpClient::errorHandling(int status)
 {
-  emit errorOccurred(status);
+  errorHandlingWithMsg( status, QString::null );
+}
+
+void SmtpClient::errorHandlingWithMsg(int status, const QString & EMsg )
+{
+  emit errorOccurred(status, EMsg );
   socket->close();
@@ -89,3 +94,2 @@ void SmtpClient::incomingData()
   response = socket->readLine();
-
   switch(status) {
@@ -96,3 +100,3 @@ void SmtpClient::incomingData()
             *stream << "HELO there\r\n";
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -101,5 +105,6 @@ void SmtpClient::incomingData()
           if (response[0] == '2') {
-            *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
+             qDebug(mailPtr->from);
+            *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
             status = Recv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse, response );
           break;
@@ -107,9 +112,10 @@ void SmtpClient::incomingData()
     case Recv:  {
-          if (response[0] == '2') {
+       if (response[0] == '2') {
             it = mailPtr->to.begin();
-            if (it == NULL)
-              errorHandling(ErrUnknownResponse);
-            *stream << "RCPT TO: " << *it << ">\r\n";
+            if (it == NULL) {
+              errorHandlingWithMsg(ErrUnknownResponse,response);
+            }
+            *stream << "RCPT TO: <" << *it << ">\r\n";
             status = MRcv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -125,3 +131,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
         } 
@@ -132,3 +138,4 @@ void SmtpClient::incomingData()
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
-          } else errorHandling(ErrUnknownResponse);
+            
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -144,3 +151,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -158,3 +165,3 @@ void SmtpClient::incomingData()
             socket->close();
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;