some bugfixes

When edit a mail to send and cancel is pressed the mail can stored in a draft
folder and later edit again. This moment we will not store attachments into
drafts.

1 files changed, 15 insertions, 10 deletions

diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index 886fb1d..1b9fc79 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -10,43 +10,48 @@
 #include <libmailwrapper/mailwrapper.h>
 
 
 
 class AddressPicker : public AddressPickerUI
 {
-	Q_OBJECT
+    Q_OBJECT
 
 public:
-	AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
-	static QString getNames();
+    AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    static QString getNames();
 
 protected:
-	QString selectedNames;
-	void accept();
+    QString selectedNames;
+    void accept();
 
 };
 
+class RecMail;
 
 class ComposeMail : public ComposeMailUI
 {
     Q_OBJECT
-    
+
 public:
     ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    virtual ~ComposeMail();
+
+    void reEditMail(const RecMail&current);
 
 public slots:
     void slotAdjustColumns();
 
     void setTo( const QString & to );
     void setSubject( const QString & subject );
     void setInReplyTo( const QString & messageId );
     void setMessage( const QString & text );
 
 protected slots:
     void accept();
-    
+    void reject();
+
 private slots:
     void fillValues( int current );
     void pickAddress( QLineEdit *line );
     void pickAddressTo();
     void pickAddressCC();
     void pickAddressBCC();
@@ -59,16 +64,16 @@ protected:
     QList<SMTPaccount> smtpAccounts;
     QString m_replyid;
 };
 
 class AttachViewItem : public QListViewItem
 {
-public:	
+public:
     AttachViewItem( QListView *parent, Attachment *att );
-	Attachment *getAttachment() { return attachment; }
+    Attachment *getAttachment() { return attachment; }
 
 private:
-	Attachment *attachment;
+    Attachment *attachment;
 
 };
 
 #endif