1 files changed, 21 insertions, 22 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index b9c9cbc..445cc5e 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -143,159 +143,158 @@ void ComposeMail::fillValues( int )
     if ( smtp->getUseReply() ) {
         replyLine->setText( smtp->getReply() );
     }
     sigMultiLine->setText( smtp->getSignature() );
 #endif
 }
 
 void ComposeMail::slotAdjustColumns()
 {
     int currPage = tabWidget->currentPageIndex();
 
     tabWidget->showPage( attachTab );
     attList->setColumnWidth( 0, attList->visibleWidth() - 80 );
     attList->setColumnWidth( 1, 80 );
 
     tabWidget->setCurrentPage( currPage );
 }
 
 void ComposeMail::addAttachment()
 {
     DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select a File.</p>" ),
                                   tr( "Ok" ) );
     } else {
         attList->takeItem( attList->currentItem() );
     }
 }
 
 void ComposeMail::accept()
 {
     if ( checkBoxLater->isChecked() ) {
         qDebug(  "Send later" );
     }
 
 #if 0
     qDebug( "Sending Mail with " +
             smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
 #endif
-    Mail mail;
+    Opie::osmart_pointer<Mail> mail=new Mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
-    mail.setMail(fromBox->currentText());
+    mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
-        mail.setTo( toLine->text() );
+        mail->setTo( toLine->text() );
     } else {
         QMessageBox::warning(0,tr("Sending mail"),
             tr("No Receiver spezified" ) );
         return;
     }
-    mail.setName(senderNameEdit->text());
-    mail.setCC( ccLine->text() );
-    mail.setBCC( bccLine->text() );
-    mail.setReply( replyLine->text() );
-    mail.setSubject( subjectLine->text() );
+    mail->setName(senderNameEdit->text());
+    mail->setCC( ccLine->text() );
+    mail->setBCC( bccLine->text() );
+    mail->setReply( replyLine->text() );
+    mail->setSubject( subjectLine->text() );
     if (!m_replyid.isEmpty()) {
         QStringList ids;
         ids.append(m_replyid);
-        mail.setInreply(ids);
+        mail->setInreply(ids);
     }
     QString txt = message->text();
     if ( !sigMultiLine->text().isEmpty() ) {
         txt.append( "\n--\n" );
         txt.append( sigMultiLine->text() );
     }
-    qDebug(txt);
-    mail.setMessage( txt );
+    mail->setMessage( txt );
     AttachViewItem *it = (AttachViewItem *) attList->firstChild();
     while ( it != NULL ) {
-        mail.addAttachment( it->getAttachment() );
+        mail->addAttachment( it->getAttachment() );
         it = (AttachViewItem *) it->nextSibling();
     }
 
     SMTPwrapper wrapper( smtp );
     wrapper.sendMail( mail,checkBoxLater->isChecked() );
 
     QDialog::accept();
 }
 
 void ComposeMail::reject()
 {
     int yesno = QMessageBox::warning(0,tr("Store message"),
                                      tr("Store message into drafts?"),
                                      tr("Yes"),
                                      tr("No"),QString::null,0,1);
 
     if (yesno == 0) {
-        Mail mail;
-        mail.setMail(fromBox->currentText());
-        mail.setTo( toLine->text() );
-        mail.setName(senderNameEdit->text());
-        mail.setCC( ccLine->text() );
-        mail.setBCC( bccLine->text() );
-        mail.setReply( replyLine->text() );
-        mail.setSubject( subjectLine->text() );
+        Opie::osmart_pointer<Mail> mail=new Mail();
+        mail->setMail(fromBox->currentText());
+        mail->setTo( toLine->text() );
+        mail->setName(senderNameEdit->text());
+        mail->setCC( ccLine->text() );
+        mail->setBCC( bccLine->text() );
+        mail->setReply( replyLine->text() );
+        mail->setSubject( subjectLine->text() );
         if (!m_replyid.isEmpty()) {
             QStringList ids;
             ids.append(m_replyid);
-            mail.setInreply(ids);
+            mail->setInreply(ids);
         }
         QString txt = message->text();
         if ( !sigMultiLine->text().isEmpty() ) {
             txt.append( "\n--\n" );
             txt.append( sigMultiLine->text() );
         }
         qDebug(txt);
-        mail.setMessage( txt );
+        mail->setMessage( txt );
         
         /* only use the default drafts folder name! */
         Storemail wrapper(AbstractMail::draftFolder());
         wrapper.storeMail(mail);
         
         AttachViewItem *it = (AttachViewItem *) attList->firstChild();
         /* attachments we will ignore! */
         if ( it != NULL ) {
             QMessageBox::warning(0,tr("Store message"),
                 tr("<center>Attachments will not be stored in \"Draft\" folder</center>"));
         }
     }
     QDialog::reject();
 }
 
 ComposeMail::~ComposeMail()
 {
 }
 
 void ComposeMail::reEditMail(const RecMail&current)
 {
     RecMail data = current;
     message->setText(data.Wrapper()->fetchBody(current).Bodytext());
     subjectLine->setText( data.getSubject());
     toLine->setText(data.To().join(","));
     ccLine->setText(data.CC().join(","));
     bccLine->setText(data.Bcc().join(","));
     replyLine->setText(data.Replyto());
 }
 
 AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
     : QListViewItem( parent )
 {
     attachment = att;
     qDebug( att->getMimeType() );
     setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ?
                   Resource::loadPixmap( "UnknownDocument-14" ) :
                   attachment->getDocLnk().pixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
     setText( 1, QString::number( att->getSize() ) );
 }