- replied mails will get the flag answered

- text fix in preparing the message for a reply

11 files changed, 81 insertions, 4 deletions

diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h
index 0a1719d..62e0715 100644
--- a/noncore/net/mail/abstractmail.h
+++ b/noncore/net/mail/abstractmail.h
@@ -24,2 +24,3 @@ public:
     virtual void deleteMail(const RecMail&mail)=0;
+    virtual void answeredMail(const RecMail&mail)=0;
     
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 912a412..b253b49 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -741 +741,31 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
 }
+
+void IMAPwrapper::answeredMail(const RecMail&mail)
+{
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err;
+    login();
+    if (!m_imap) {
+        return;
+    }
+    const char *mb = mail.getMbox().latin1();
+    err = mailimap_select( m_imap, (char*)mb);
+    if ( err != MAILIMAP_NO_ERROR ) {
+        qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
+        return;
+    }
+    flist = mailimap_flag_list_new_empty();
+    mailimap_flag_list_add(flist,mailimap_flag_new_answered());
+    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    set = mailimap_set_new_single(mail.getNumber());
+    err = mailimap_store(m_imap,set,store_flags);
+    mailimap_set_free( set );
+    mailimap_store_att_flags_free(store_flags);
+
+    if (err != MAILIMAP_NO_ERROR) {
+        qDebug("error marking mail: %s",m_imap->imap_response);
+        return;
+    }
+}
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
index 4f4d575..700d512 100644
--- a/noncore/net/mail/imapwrapper.h
+++ b/noncore/net/mail/imapwrapper.h
@@ -27,2 +27,3 @@ public:
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 0a1719d..62e0715 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -24,2 +24,3 @@ public:
     virtual void deleteMail(const RecMail&mail)=0;
+    virtual void answeredMail(const RecMail&mail)=0;
     
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 912a412..b253b49 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -741 +741,31 @@ void IMAPwrapper::deleteMail(const RecMail&mail)
 }
+
+void IMAPwrapper::answeredMail(const RecMail&mail)
+{
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err;
+    login();
+    if (!m_imap) {
+        return;
+    }
+    const char *mb = mail.getMbox().latin1();
+    err = mailimap_select( m_imap, (char*)mb);
+    if ( err != MAILIMAP_NO_ERROR ) {
+        qDebug("error selecting mailbox for mark: %s",m_imap->imap_response);
+        return;
+    }
+    flist = mailimap_flag_list_new_empty();
+    mailimap_flag_list_add(flist,mailimap_flag_new_answered());
+    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    set = mailimap_set_new_single(mail.getNumber());
+    err = mailimap_store(m_imap,set,store_flags);
+    mailimap_set_free( set );
+    mailimap_store_att_flags_free(store_flags);
+
+    if (err != MAILIMAP_NO_ERROR) {
+        qDebug("error marking mail: %s",m_imap->imap_response);
+        return;
+    }
+}
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index 4f4d575..700d512 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -27,2 +27,3 @@ public:
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 5065d29..46c854b 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -289 +289,5 @@ void POP3wrapper::deleteMail(const RecMail&)
 }
+
+void POP3wrapper::answeredMail(const RecMail&)
+{
+}
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index ef972c8..6ff8d62 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -22,2 +22,3 @@ public:
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 5065d29..46c854b 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -289 +289,5 @@ void POP3wrapper::deleteMail(const RecMail&)
 }
+
+void POP3wrapper::answeredMail(const RecMail&)
+{
+}
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index ef972c8..6ff8d62 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -22,2 +22,3 @@ public:
     virtual void deleteMail(const RecMail&mail);
+    virtual void answeredMail(const RecMail&mail);
 
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index e53f4a3..68d3c51 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -261,3 +261,3 @@ void ViewMail::slotReply()
                 rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
-                .arg(  m_mail[1] )
+                .arg(  m_mail[0] )
                 .arg( m_mail[3] );
@@ -282,4 +282,5 @@ void ViewMail::slotReply()
         composer.showMaximized();
-        composer.exec();
-
+    if ( QDialog::Accepted==composer.exec()) {
+        m_recMail.Wrapper()->answeredMail(m_recMail);
+    }
 }
@@ -316,3 +317,5 @@ void ViewMail::slotForward()
         composer.showMaximized();
-        composer.exec();
+    if ( QDialog::Accepted==composer.exec()) {
+        
+    }
 }