1 files changed, 89 insertions, 88 deletions

diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index b039cc4..2102ba7 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -344,49 +344,49 @@ void EmailClient::getNewMail() {
   while (item != NULL) {
     mailPtr = item->getMail();
     if ( (!mailPtr->downloaded) && (mailPtr->fromAccountId == currentAccount->id) ) {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
   }*/
   
   emailHandler->getMailHeaders();
   
 }
 
 void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
   getNewMail();  
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 {
   Enclosure *ePtr;
   Email newMail;
   int thisMailId;
-  emailHandler->parse(mail.rawMail, lineShift, &newMail);
+  emailHandler->parse( mail.rawMail, lineShift, &newMail);
   mailconf->setGroup(newMail.id);
   
   if (fromDisk) 
   {
     
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
     newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
   } 
   else 
   {  //mail arrived from server
   
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
     
     newMail.fromAccountId = emailHandler->getAccount()->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
   
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
     
@@ -440,59 +440,60 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
             }
     } else {
       ePtr->saved = mailconf->readBoolEntry("saved_" + stringId);
       ePtr->installed = mailconf->readBoolEntry("installed_" + stringId);
       if (ePtr->saved) {
         ePtr->name = mailconf->readEntry("filename_" + stringId);
         ePtr->path = mailconf->readEntry("path_" + stringId);
       }   
     }
   }
 
   bool found=false;
   
   if (!fromDisk) 
   {
     
     Email *mailPtr;
     item = (EmailListItem *) inboxView->firstChild();
     while ((item != NULL)&&(!found)) 
     {
       mailPtr = item->getMail();
       if (mailPtr->id == newMail.id) {
         item->setMail(newMail);
         emit mailUpdated(item->getMail());
-              found = true;
+        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 ((!found)||(fromDisk)) {
+     item = new EmailListItem(inboxView, newMail, TRUE);
+  }
+      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)
 {
   // not previewing means all mailtransfer has been done
   /*if (!previewingMail) {*/
     if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) {
       emit newCaption("Mailit - " + currentAccount->accountName);
       getNewMail();
       return;
     } else {
       allAccounts = FALSE;
       receiving = FALSE;
       getMailButton->setEnabled(TRUE);
       cancelButton->setEnabled(FALSE);
       selectAccountMenu->setEnabled(TRUE);
       status1Label->setText("Idle");
   
       progressBar->reset();
@@ -621,49 +622,49 @@ void EmailClient::readMail()
   QFile fo(getPath(FALSE) + "outbox.txt");
   if ( fo.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &fo );        // use a text stream
     s = t.read();
     fo.close();
     
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
     
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       emailHandler->parse(mail.rawMail, lineShift, &mail);
       mail.sent = false;
       mail.received = false;
           enqueMail(mail);
       
     }
   }
 }
 
-void EmailClient::saveMail(QString fileName, QListView *view)
+void EmailClient::saveMail(const QString &fileName, QListView *view)
 {
   QFile f(fileName);
   Email *mail;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not open file");
     return;
   }
   item = (EmailListItem *) view->firstChild();
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
     t << mail->rawMail;
     
     mailconf->setGroup(mail->id);
     mailconf->writeEntry("mailread", mail->read);
     
     item = (EmailListItem *) item->nextSibling();
   }
   f.close();
 }
 
 //paths for mailit, is settings, inbox, enclosures
 QString EmailClient::getPath(bool enclosurePath)
@@ -691,49 +692,49 @@ void EmailClient::readSettings()
 {
   int y,acc_count;
     
     mailconf->setGroup("mailitglobal");
     acc_count=mailconf->readNumEntry("Accounts",0);
     
     for (int accountPos = 0;accountPos<acc_count ; accountPos++) 
     {
       mailconf->setGroup("Account_"+QString::number(accountPos+1));    //Account numbers start at 1 ...      
       account.accountName = mailconf->readEntry("AccName","");
       account.name = mailconf->readEntry("UserName","");
       account.emailAddress = mailconf->readEntry("Email","");
       account.popUserName = mailconf->readEntry("POPUser","");
       account.popPasswd = mailconf->readEntryCrypt("POPPassword","");
       account.popServer = mailconf->readEntry("POPServer","");
       account.smtpServer = mailconf->readEntry("SMTPServer","");
       account.id = mailconf->readNumEntry("AccountId",0);
       account.syncLimit = mailconf->readNumEntry("HeaderLimit",0);
       account.lastServerMailCount = 0;
       account.synchronize = FALSE;
     
       account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes");
       if (account.synchronize)
       {
-            mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); 
+      mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); 
       }
       
       accountList.append(&account);
     }
   
   mailconf->setGroup("mailitglobal");
   
   if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) 
   {
     mailIdCount = y;
   }
   if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) 
   {
     accountIdCount = y;
   }
 }
 
 void EmailClient::saveSettings()
 {
   int acc_count=0;
   MailAccount *accountPtr;
 
     
   if (!mailconf) 
@@ -894,143 +895,143 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox)
 void EmailClient::setMailSize(int size)
 {
         progressBar->reset();
         progressBar->setTotalSteps(size);
 }
 
 void EmailClient::setTotalSize(int size)
 {
   
 }
 
 void EmailClient::setDownloadedSize(int size)
 {
         int total = progressBar->totalSteps();
 
         if (size < total) {
     progressBar->setProgress(size);
         } else {
           progressBar->setProgress(total);
         }
 }
 
 void EmailClient::deleteItem()
 {
-        bool inbox=mailboxView->currentTab()==0;
-        QListView* box;
-        
-        EmailListItem* eli;
-        int pos;
-                
-        inbox ? box=inboxView : box=outboxView;
-        
-        eli=(EmailListItem*)box->selectedItem();
-        
-        if (eli)
-        {
-                        box->setSelected(eli->itemBelow(),true);//select the previous item
-                
-                        deleteMail(eli,(bool&)inbox);   //remove mail entry
-        }
+  bool inbox=mailboxView->currentTab()==0;
+  QListView* box;
+  
+  EmailListItem* eli;
+  int pos;
+    
+  inbox ? box=inboxView : box=outboxView;
+  
+  eli=(EmailListItem*)box->selectedItem();
+  
+  if (eli)
+  {
+    box->setSelected(eli->itemBelow(),true);  //select the previous item
+    
+    deleteMail(eli,(bool&)inbox);   //remove mail entry
+  }
 }
 
 void EmailClient::inboxItemPressed()
 {
-        //timerID=startTimer(500);
+//  timerID=startTimer(500);
 }
 
 void EmailClient::inboxItemReleased()
 {
-          //killTimer(timerID);
+  //  killTimer(timerID);
 }
 
 /*void EmailClient::timerEvent(QTimerEvent *e)
 {
   /*killTimer(timerID);
   
   
   QPopupMenu *action = new QPopupMenu(this);
   
   int reply=0;
   
   action->insertItem(tr( "Reply To" ),this,SLOT(reply()));
   action->insertItem( tr( "Reply All" ),this,SLOT(replyAll()));
   action->insertItem( tr( "Forward" ), this,SLOT(forward()));
   action->insertItem( tr( "Remove Mail" ), this,SLOT(remove()));
  
   action->exec(QCursor::pos());
   
   if (action) delete action;
    
 }*/
 
 Email* EmailClient::getCurrentMail()
 {
-        EmailListItem *eli=(EmailListItem* ) (inboxView->selectedItem());
-        if (eli!=NULL)
-                return eli->getMail();
-        else
-                return NULL;
+  EmailListItem *eli=(EmailListItem* ) (inboxView->selectedItem());
+  if (eli!=NULL)
+    return eli->getMail();
+  else
+    return NULL;
 }
   
 void EmailClient::download(Email* mail)
 {
-        MailAccount* acc=0;
-        
-        tempMailDownloadList.clear();
-        tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-        
-        acc=accountList.at(mail->fromAccountId-1);
-        if (acc)
-        { 
-                emailHandler->setAccount(*acc);
-                emailHandler->getMailByList(&tempMailDownloadList);
-        }
-        else 
-                QMessageBox::warning(qApp->activeWindow(),
-                tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
+  MailAccount* acc=0;
+  
+  tempMailDownloadList.clear();
+  tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
+  
+  acc=accountList.at(mail->fromAccountId-1);
+  if (acc)
+  { 
+    emailHandler->setAccount(*acc);
+    emailHandler->getMailByList(&tempMailDownloadList);
+  }
+  else 
+    QMessageBox::warning(qApp->activeWindow(),
+          tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
 }
 
 void EmailClient::receive(const QCString& msg, const QByteArray& data)
 {
-        /*if (msg=="getMail()")
-        {
-                /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
-                QVBoxLayout *vbProg = new QVBoxLayout( &qd );
-        
-                initStatusBar(&qd);
-                
-                if (statusBar==0)
-                {
-                        qDebug("No Bar ...");
-                        //statusBar=new ProgressBar(&qd);
-                }
-                statusBar->show();
-                vbProg->addWidget(statusBar);
-                qd.showMaximized();
-                qd.show();
-                emit getAllNewMail();
-                //qd.exec();
-        }
-        else if (msg=="compose()")
-                {
-                QDialog qd(qApp->activeWindow(),"Getting mail",true);
-                
-                WriteMail wm(&qd,"write new mail");
-                QVBoxLayout vbProg( &qd );
-                
-                wm.showMaximized();
-                vbProg.addWidget(&wm);
-                
-                qd.showMaximized();
-                
-                emit composeRequested();
-                qd.exec();
-                
-                QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
-        }
-                
-        else if (msg=="dialog()")
-        {
-            QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
-        }*/
+  /*if (msg=="getMail()")
+  {
+    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    QVBoxLayout *vbProg = new QVBoxLayout( &qd );
+  
+    initStatusBar(&qd);
+    
+    if (statusBar==0)
+    {
+      qDebug("No Bar ...");
+      //statusBar=new ProgressBar(&qd);
+    }
+    statusBar->show();
+    vbProg->addWidget(statusBar);
+    qd.showMaximized();
+    qd.show();
+    emit getAllNewMail();
+    //qd.exec();
+  }
+  else if (msg=="compose()")
+  { 
+    QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    
+    WriteMail wm(&qd,"write new mail");
+    QVBoxLayout vbProg( &qd );
+    
+    wm.showMaximized();
+    vbProg.addWidget(&wm);
+    
+    qd.showMaximized();
+    
+    emit composeRequested();
+    qd.exec();
+    
+    QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+  }
+    
+  else if (msg=="dialog()")
+  {
+      QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+  }*/
 }