6 files changed, 42 insertions, 34 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 2102ba7..da1226c 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -464,20 +464,20 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
         found = true;
       }
       item = (EmailListItem *) item->nextSibling();
     }
   }
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
-      if (item->getMail()->files.count()>0)
-      {
-      item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-      }  
+//        if (item->getMail()->files.count()>0)
+//        {
+//        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
+//        }  
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
   
   mailboxView->setCurrentTab(0);
   
 }
 
 void EmailClient::allMailArrived(int count)
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 59ccd90..39f693d 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -170,18 +170,20 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   
   delimiter = lineShift + lineShift;  // "\n\n" or "\r\n\r\n"
   pos = in.find(delimiter, 0, FALSE);
   header = in.left(pos);
   body = in.right(in.length() - pos - delimiter.length());
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
-  TextParser p(header, lineShift);
-  
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
+
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
       mail->from = p.getString(&pos, '<', false);
       mail->from = mail->from.stripWhiteSpace();
       if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) {
         mail->from = mail->from.left(mail->from.length() - 1);
         mail->from = mail->from.right(mail->from.length() - 1);
@@ -265,16 +267,17 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
         boundary = boundary.right(boundary.length() - 1); //strip "
       }
       boundary = "--" + boundary;   //create boundary field
     }
     
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
+     delete lp;
       return mail;
     }
     
     while (body.length() > 0) {
       pos = body.find(boundary, 0, FALSE);
       pos = body.find(delimiter, pos, FALSE);
       mimeHeader = body.left(pos);
       mimeBody = body.right(body.length() - pos - delimiter.length());
@@ -333,16 +336,17 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
           mail->body = mimeBody;
         }
       }
     }
   } else {
     mail->bodyPlain = body;
     mail->body = body;
   }
+  delete lp;
   return TRUE;
 }
 
 bool EmailHandler::getEnclosure(Enclosure *ePtr)
 {
   QFile f(ePtr->path + ePtr->name);
   char src[4];
   char *destPtr;
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index a111241..f945a0f 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -117,35 +117,35 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
 {
   viewingMail = TRUE;
   emailClient->hide();
   
   int result=0;
   
   if ((mail->received)&&(!mail->downloaded))
   {   
-          QMessageBox mb( tr("Mail not downloaded"),
+    QMessageBox mb( tr("Mail not downloaded"),
                     tr("The mail you have clicked \n"
-                    "has not been downloaded yet.\n "
-                    "Would you like to do it now ?"),
+        "has not been downloaded yet.\n "
+        "Would you like to do it now ?"),
                     QMessageBox::Information,
                     QMessageBox::Yes | QMessageBox::Default,
                     QMessageBox::No | QMessageBox::Escape,0 );
-                 
-        result=mb.exec();
-        
-        if (result==QMessageBox::Yes)
-        {
-                emailClient->download(mail);
-        }
+     
+  result=mb.exec();
+  
+  if (result==QMessageBox::Yes)
+  {
+    emailClient->download(mail);
+  }
   }
   
   readMail->update(view, mail);
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read Mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)
 {
   if (viewingMail) {
     readMail->mailUpdated(mail);
   }
 }
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 2102ba7..da1226c 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -464,20 +464,20 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
         found = true;
       }
       item = (EmailListItem *) item->nextSibling();
     }
   }
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
-      if (item->getMail()->files.count()>0)
-      {
-      item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-      }  
+//        if (item->getMail()->files.count()>0)
+//        {
+//        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
+//        }  
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
   
   mailboxView->setCurrentTab(0);
   
 }
 
 void EmailClient::allMailArrived(int count)
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 59ccd90..39f693d 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -170,18 +170,20 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   
   delimiter = lineShift + lineShift;  // "\n\n" or "\r\n\r\n"
   pos = in.find(delimiter, 0, FALSE);
   header = in.left(pos);
   body = in.right(in.length() - pos - delimiter.length());
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
-  TextParser p(header, lineShift);
-  
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
+
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
       mail->from = p.getString(&pos, '<', false);
       mail->from = mail->from.stripWhiteSpace();
       if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) {
         mail->from = mail->from.left(mail->from.length() - 1);
         mail->from = mail->from.right(mail->from.length() - 1);
@@ -265,16 +267,17 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
         boundary = boundary.right(boundary.length() - 1); //strip "
       }
       boundary = "--" + boundary;   //create boundary field
     }
     
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
+     delete lp;
       return mail;
     }
     
     while (body.length() > 0) {
       pos = body.find(boundary, 0, FALSE);
       pos = body.find(delimiter, pos, FALSE);
       mimeHeader = body.left(pos);
       mimeBody = body.right(body.length() - pos - delimiter.length());
@@ -333,16 +336,17 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
           mail->body = mimeBody;
         }
       }
     }
   } else {
     mail->bodyPlain = body;
     mail->body = body;
   }
+  delete lp;
   return TRUE;
 }
 
 bool EmailHandler::getEnclosure(Enclosure *ePtr)
 {
   QFile f(ePtr->path + ePtr->name);
   char src[4];
   char *destPtr;
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index a111241..f945a0f 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -117,35 +117,35 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
 {
   viewingMail = TRUE;
   emailClient->hide();
   
   int result=0;
   
   if ((mail->received)&&(!mail->downloaded))
   {   
-          QMessageBox mb( tr("Mail not downloaded"),
+    QMessageBox mb( tr("Mail not downloaded"),
                     tr("The mail you have clicked \n"
-                    "has not been downloaded yet.\n "
-                    "Would you like to do it now ?"),
+        "has not been downloaded yet.\n "
+        "Would you like to do it now ?"),
                     QMessageBox::Information,
                     QMessageBox::Yes | QMessageBox::Default,
                     QMessageBox::No | QMessageBox::Escape,0 );
-                 
-        result=mb.exec();
-        
-        if (result==QMessageBox::Yes)
-        {
-                emailClient->download(mail);
-        }
+     
+  result=mb.exec();
+  
+  if (result==QMessageBox::Yes)
+  {
+    emailClient->download(mail);
+  }
   }
   
   readMail->update(view, mail);
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read Mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)
 {
   if (viewingMail) {
     readMail->mailUpdated(mail);
   }
 }