patch from wim delvaux. fix from me

14 files changed, 100 insertions, 81 deletions

diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index daefac6..19ac58f 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -58,3 +58,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 {
-        setCaption("Adding attachments");
+        setCaption(tr("Adding attachments") );
 
@@ -124,3 +124,3 @@ void AddAtt::clear()
 void AddAtt::addattachment()
-        {
+        {// ### FIXME wrong use -zecke
         OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index da1226c..749a4e9 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -61,6 +61,6 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
-  connect(emailHandler, SIGNAL(smtpError(int)), this,
-      SLOT(smtpError(int)) );
-  connect(emailHandler, SIGNAL(popError(int)), this,
-      SLOT(popError(int)) );
+  connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
+      SLOT(smtpError(int,const QString &)) );
+  connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
+      SLOT(popError(int,const QString &)) );
   
@@ -482,3 +482,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
 {
@@ -520,3 +520,3 @@ void EmailClient::moveMailFront(Email *mailPtr)
 
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
 {
@@ -524,11 +524,13 @@ void EmailClient::smtpError(int code)
   
-  if (code == ErrUnknownResponse)
-    temp = "Unknown response from server";
-  
-  if (code == QSocket::ErrHostNotFound)
-    temp = "host not found";
-  if (code == QSocket::ErrConnectionRefused)
-    temp = "connection refused";
-  if (code == QSocket::ErrSocketRead)
-    temp = "socket packet error";
+  if (code == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == QSocket::ErrHostNotFound) {
+      temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+      temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+      temp = tr("<qt>socket packet error</qt>");
+   }
   
@@ -546,3 +548,3 @@ void EmailClient::smtpError(int code)
 
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
 {
@@ -550,16 +552,19 @@ void EmailClient::popError(int code)
   
-  if (code == ErrUnknownResponse)
-    temp = "Unknown response from server";
-  if (code == ErrLoginFailed)
-    temp = "Login failed\nCheck user name and password";
-  
-  if (code == QSocket::ErrHostNotFound)
-    temp = "host not found";
-  if (code == QSocket::ErrConnectionRefused)
-    temp = "connection refused";
-  if (code == QSocket::ErrSocketRead)
-    temp = "socket packet error";
+   if (code == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == ErrLoginFailed) {
+     temp = tr("<qt>Login failed\nCheck user name and password</qt>");
+   } else if (code == QSocket::ErrHostNotFound) {
+     temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+     temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+     temp = tr("<qt>socket packet error</qt>");
+   } 
     
   if (code != ErrCancel) {
-    QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
+      QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n"));
+
   } else {
@@ -900,3 +905,3 @@ void EmailClient::setMailSize(int size)
 
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
 {
@@ -922,3 +927,3 @@ void EmailClient::deleteItem()
   EmailListItem* eli;
-  int pos;
+  //  int pos;
     
@@ -948,3 +953,3 @@ void EmailClient::inboxItemReleased()
 {
-  /*killTimer(timerID);
+  //killTimer(timerID);
   
@@ -993,3 +998,3 @@ void EmailClient::download(Email* mail)
 
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
 {
@@ -997,3 +1002,3 @@ void EmailClient::receive(const QCString& msg, const QByteArray& data)
   {
-    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h
index c98cfce..80c6d31 100644
--- a/noncore/unsupported/mailit/emailclient.h
+++ b/noncore/unsupported/mailit/emailclient.h
@@ -100,4 +100,4 @@ public slots:
   void getAllNewMail();
-  void smtpError(int code);
-  void popError(int code);
+  void smtpError(int code, const QString & Msg );
+  void popError(int code, const QString & Msg);
   void inboxItemSelected();
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 39f693d..5b8bda1 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -46,4 +46,4 @@ EmailHandler::EmailHandler()
   
-  connect(smtpClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(smtpError(int)) );
+  connect(smtpClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(smtpError(int, const QString &)) );
   connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
@@ -52,4 +52,4 @@ EmailHandler::EmailHandler()
   
-  connect(popClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(popError(int)) );
+  connect(popClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(popError(int, const QString &)) );
   connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h
index e4e7f46..74a8e4c 100644
--- a/noncore/unsupported/mailit/emailhandler.h
+++ b/noncore/unsupported/mailit/emailhandler.h
@@ -129,4 +129,4 @@ signals:
   void mailSent();
-  void smtpError(int);
-  void popError(int);
+  void smtpError(int, const QString & Msg );
+  void popError(int, const QString & Msg );
   void mailArrived(const Email &, bool);
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index cfbda36..5e9a83a 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,2 +1,3 @@
 TEMPLATE  = app
+TARGET = mailit
 CONFIG    = qt warn_on release
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index f945a0f..6e298c7 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -23,6 +23,6 @@
 
-MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
+MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags /*fl*/)
   : QMainWindow(parent, name, WStyle_ContextHelp)
 {
-  currentCaption = "Mailit";
+  currentCaption = tr("Mailit");
   setCaption(tr(currentCaption));
diff --git a/noncore/unsupported/mailit/maillist.cpp b/noncore/unsupported/mailit/maillist.cpp
index b5325a9..8c34295 100644
--- a/noncore/unsupported/mailit/maillist.cpp
+++ b/noncore/unsupported/mailit/maillist.cpp
@@ -76,3 +76,3 @@ void MailList::sizeInsert(int serverId, uint size)
 
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
 {
@@ -102,3 +102,3 @@ void MailList::moveFront(int serverId, uint size)
 //only works if mail is not already in download
-bool MailList::remove(int serverId, uint size)
+bool MailList::remove(int serverId, uint /*size*/)
 {
@@ -127,3 +127,3 @@ bool MailList::remove(int serverId, uint size)
 
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
 {
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index dc0116d..5da3bcb 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -65,3 +65,3 @@ void PopClient::newConnection(const QString &target, int port)
     
-  emit updateStatus("DNS lookup");
+  emit updateStatus(tr("DNS lookup"));
 }
@@ -105,4 +105,8 @@ void PopClient::errorHandling(int status)
 {
+  errorHandlingWithMsg( status, QString::null );
+}
+void PopClient::errorHandlingWithMsg(int status, const QString & Msg )
+{
   emit updateStatus(tr("Error Occured"));
-  emit errorOccurred(status);
+  emit errorOccurred(status, Msg);
   socket->close();
@@ -169,3 +173,3 @@ void PopClient::incomingData()
             status = Mcnt;      
-          } else errorHandling(ErrLoginFailed);
+          } else errorHandlingWithMsg(ErrLoginFailed, response);
             break;
@@ -197,3 +201,3 @@ void PopClient::incomingData()
 
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
@@ -236,3 +240,3 @@ void PopClient::incomingData()
               //qWarning(response);
-              errorHandling(ErrUnknownResponse);
+              errorHandlingWithMsg(ErrUnknownResponse, response);
             }
@@ -261,3 +265,3 @@ void PopClient::incomingData()
               response = socket->readLine();
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
diff --git a/noncore/unsupported/mailit/popclient.h b/noncore/unsupported/mailit/popclient.h
index c58bc48..6774ceb 100644
--- a/noncore/unsupported/mailit/popclient.h
+++ b/noncore/unsupported/mailit/popclient.h
@@ -46,3 +46,3 @@ signals:
   void newMessage(const QString &, int, uint, bool);
-  void errorOccurred(int status);
+  void errorOccurred(int status, const QString & Msg );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & );
 
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/unsupported/mailit/smtpclient.cpp
+++ b/noncore/unsupported/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;
@@ -109,7 +114,8 @@ void SmtpClient::incomingData()
             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;
diff --git a/noncore/unsupported/mailit/smtpclient.h b/noncore/unsupported/mailit/smtpclient.h
index 45c0703..554ba3f 100644
--- a/noncore/unsupported/mailit/smtpclient.h
+++ b/noncore/unsupported/mailit/smtpclient.h
@@ -49,3 +49,3 @@ public:
 signals:
-  void errorOccurred(int);
+  void errorOccurred(int, const QString & LR );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & LastResponse );
 
diff --git a/noncore/unsupported/mailit/viewatt.cpp b/noncore/unsupported/mailit/viewatt.cpp
index 21885c2..293e137 100644
--- a/noncore/unsupported/mailit/viewatt.cpp
+++ b/noncore/unsupported/mailit/viewatt.cpp
@@ -28,3 +28,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 {
-        setCaption("Exploring attatchments");
+        setCaption(tr("Exploring attatchments"));
 
@@ -37,5 +37,5 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
         listView = new QListView(this, "AttView");
-        listView->addColumn( "Attatchment" );
-        listView->addColumn( "Type" );
-        listView->addColumn( "Installed" );
+        listView->addColumn( tr("Attatchment") );
+        listView->addColumn( tr("Type") );
+        listView->addColumn( tr("Installed") );
         setCentralWidget(listView);
@@ -63,5 +63,5 @@ void ViewAtt::update(Email *mailIn, bool inbox)
                 
-                QString isInstalled = "No";
+                QString isInstalled = tr("No");
                 if (ePtr->installed)
-                        isInstalled = "Yes";
+                        isInstalled = tr("Yes");
                 item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
@@ -118,3 +118,3 @@ void ViewAtt::install()
                 selPtr->installed = TRUE;
-                item->setText(2, "Yes");
+                item->setText(2, tr("Yes"));
         }
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index 0298cb3..26b9660 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -120,3 +120,3 @@ void WriteMail::init()
         connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
-        QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
+  QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your Opie addressbook"));
 
@@ -127,4 +127,4 @@ void WriteMail::init()
         addressView = new QListView( widget, "addressView");
-        addressView->addColumn("Name");
-        addressView->addColumn("EMail");
+  addressView->addColumn(tr("Name"));
+  addressView->addColumn(tr("EMail") );
         addressView->setAllColumnsShowFocus(TRUE);
@@ -285,3 +285,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
                 if (pos != -1)
-                        mail.body.insert(++pos, ">>");
+      mail.body.insert(++pos, ">");
         }
@@ -293,3 +293,3 @@ void WriteMail::forward(Email forwMail)
 {
-        int pos=0;
+   // int pos=0;