1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 0947879..d86454c 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -139,104 +139,106 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
               encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
               if (content) {
                 QFile output(str);
                 output.open(IO_WriteOnly);
                 output.writeBlock(content->Content(),content->Length());
                 output.close();
                 delete content;
               }
             }
             }
        break ;
        case 1:
             if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
                setText();
             } else {
                if (  m_recMail.Wrapper() != 0l )  { // make sure that there is a wrapper , even after delete or simular actions
                browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
                }
             }
        break;
 }
 delete menu;
 }
 void ViewMail::setMail( RecMail mail ) {
 m_recMail = mail;
 m_mail[0] = mail.getFrom();
 m_mail[1] = mail.getSubject();
 m_mail[3] = mail.getDate();
 m_mail[4] = mail.Msgid();
 m_mail2[0] = mail.To();
 m_mail2[1] = mail.CC();
 m_mail2[2] = mail.Bcc();
 setText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
        m_gotBody = false;
+        deleted = false;
        connect(reply, SIGNAL(activated()), SLOT(slotReply()));
        connect(forward, SIGNAL(activated()), SLOT(slotForward()));
        connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail(  ) ) );
        attachments->setEnabled(m_gotBody);
        connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
 }
 void ViewMail::setText()
 {
  QString toString;
  QString ccString;
  QString bccString;
  for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
                  toString += (*it);
  }
  for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
                  ccString += (*it);
  }
  for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                  bccString += (*it);
  }
 setCaption( caption().arg( m_mail[0] ) );
     m_mailHtml = "<html><body>"
                  "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                  "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                  "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                         "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                  "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                  tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                      "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                  "</td></tr></table><font face=fixed>";
        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
        // remove later in favor of a real handling
        m_gotBody = true;
 }
 ViewMail::~ViewMail()
 {
        hide();
 }
 void ViewMail::hide()
 {
        QWidget::hide();
        if (_inLoop) {
                _inLoop = false;
@@ -288,60 +290,60 @@ void ViewMail::slotReply()
        rtext += "\n";
        QString prefix;
        if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                else prefix = "Re: ";                   // no i18n on purpose
        Settings *settings = new Settings();
        ComposeMail composer( settings ,this, 0, true);
        composer.setTo( m_mail[0] );
        composer.setSubject( "Re: " + m_mail[1] );
        composer.setMessage( rtext );
        composer.showMaximized();
    if ( QDialog::Accepted==composer.exec()) {
        m_recMail.Wrapper()->answeredMail(m_recMail);
    }
 }
 void ViewMail::slotForward()
 {
        if (!m_gotBody) {
                QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
                return;
        }
        QString ftext;
        ftext += QString("\n----- Forwarded message from %1 -----\n\n")
                .arg( m_mail[0] );
        if (!m_mail[3].isNull())
                 ftext += QString("Date: %1\n")
                         .arg( m_mail[3] );
        if (!m_mail[0].isNull())
                 ftext += QString("From: %1\n")
                         .arg( m_mail[0] );
        if (!m_mail[1].isNull())
                 ftext += QString("Subject: %1\n")
                         .arg( m_mail[1] );
        ftext += QString("\n%1\n")
                 .arg( m_mail[2]);
        ftext += QString("----- End forwarded message -----\n");
        Settings *settings = new Settings();
        ComposeMail composer( settings ,this, 0, true);
        composer.setSubject( "Fwd: " + m_mail[1] );
        composer.setMessage( ftext );
        composer.showMaximized();
    if ( QDialog::Accepted==composer.exec()) {
-        
    }
 }
 void ViewMail::slotDeleteMail( )
 {
    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
        m_recMail.Wrapper()->deleteMail( m_recMail );
        hide();
        deleted = true;
    }
 }