- MHfolder in accountview enhanced

- mv/cp mails has special methods when copy between folder inside a
  mh storage
- removed obsolete vars inside pop3wrapper

4 files changed, 86 insertions, 28 deletions

diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 5adba55..512f778 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -331,3 +331,71 @@ const QString&MHwrapper::getName()const
 {
     return MHName;
 }
+void MHwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+{
+    init_storage();
+    if (!m_storage) {
+        return;
+    }
+    if (targetWrapper != this) {
+        qDebug("Using generic");
+        Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit);
+        return;
+    }
+    qDebug("Using internal routines for move/copy");
+    QString tf = buildPath(targetFolder);
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());    
+    if (r != MAIL_NO_ERROR) {
+        qDebug("Error selecting source mailbox");
+        return;
+    }
+    if (moveit) {
+        r = mailsession_move_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+    } else {
+        r = mailsession_copy_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+    }
+    if (r != MAIL_NO_ERROR) {
+        qDebug("Error copy/moving mail internal (%i)",r);
+    }
+}
+
+void MHwrapper::mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+{
+    init_storage();
+    if (!m_storage) {
+        return;
+    }
+    if (targetWrapper != this) {
+        qDebug("Using generic");
+        Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
+        return;
+    }
+    if (!fromFolder) return;
+    int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1());
+    if (r!=MAIL_NO_ERROR) {
+        qDebug("error selecting source folder!");
+        return;
+    }
+    QString tf = buildPath(targetFolder);
+    mailmessage_list*l=0;
+    r = mailsession_get_messages_list(m_storage->sto_session,&l);
+    if (r != MAIL_NO_ERROR) {
+        qDebug("Error message list");
+    }
+    unsigned j = 0;
+    for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) {
+        mailmessage * msg;
+        msg = (mailmessage*)carray_get(l->msg_tab, i);
+        j = msg->msg_index;
+        if (moveit) {
+            r = mailsession_move_message(m_storage->sto_session,j,(char*)tf.latin1());
+        } else {
+            r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1());
+        }
+        if (r != MAIL_NO_ERROR) {
+            qDebug("Error copy/moving mail internal (%i)",r);
+            break;
+        }
+    }
+    if (l) mailmessage_list_free(l);
+}
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h
index 7f028b4..79dec30 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.h
@@ -22,6 +22,8 @@ public:
 
     virtual void deleteMail(const RecMail&mail);
     virtual void answeredMail(const RecMail&mail);
+    virtual void mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
+    virtual void mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     
     virtual int createMbox(const QString&folder,const Folder*f=0,const QString&d="",bool s=false);
     virtual int deleteMbox(const Folder*);
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index f5eca4a..14c2059 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -14,7 +14,6 @@ POP3wrapper::POP3wrapper( POP3account *a )
 : Genericwrapper() {
     account = a;
     m_pop3 = NULL;
-    m_folder = NULL;
     msgTempName = a->getFileName()+"_msg_cache";
     last_msg_id = 0;
 }
@@ -58,7 +57,7 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
         }
         msg_cache.open(IO_ReadWrite|IO_Truncate);
         last_msg_id = mail.getNumber();
-        err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
+        err = mailsession_get_message(m_pop3->sto_session, mail.getNumber(), &mailmsg);
         err = mailmessage_fetch(mailmsg,&message,&length);
         msg_cache.writeBlock(message,length);
     } else {
@@ -94,17 +93,19 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
     return body;
 }
 
-void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) {
+void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) 
+{
     login();
     if (!m_pop3)
         return;
     uint32_t res_messages,res_recent,res_unseen;
-    mailsession_status_folder(m_folder->fld_session,"INBOX",&res_messages,&res_recent,&res_unseen);
-    parseList(target,m_folder->fld_session,"INBOX");
+    mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
+    parseList(target,m_pop3->sto_session,"INBOX");
     Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
 }
 
-void POP3wrapper::login() {
+void POP3wrapper::login()
+{
     if (account->getOffline())
         return;
     /* we'll hold the line */
@@ -157,32 +158,20 @@ void POP3wrapper::login() {
                           (char*)user,(char*)pass,0,0,0);
 
 
-
-    m_folder = mailfolder_new(m_pop3, NULL, NULL);
-
-    if (m_folder==0) {
-        Global::statusMessage(tr("Error initializing folder"));
-        mailstorage_free(m_pop3);
-        m_pop3 = NULL;
-        return;
-    }
-    err = mailfolder_connect(m_folder);
+    err = mailstorage_connect(m_pop3);
     if (err != MAIL_NO_ERROR) {
         qDebug( QString( "FEHLERNUMMER %1" ).arg(  err ) );
         Global::statusMessage(tr("Error initializing folder"));
-        mailfolder_free(m_folder);
-        m_folder = 0;
         mailstorage_free(m_pop3);
         m_pop3 = 0;
     }
 }
 
-void POP3wrapper::logout() {
+void POP3wrapper::logout() 
+{
     int err = MAILPOP3_NO_ERROR;
     if ( m_pop3 == NULL )
         return;
-    mailfolder_free(m_folder);
-    m_folder = 0;
     mailstorage_free(m_pop3);
     m_pop3 = 0;
 }
@@ -200,7 +189,7 @@ void POP3wrapper::deleteMail(const RecMail&mail) {
     login();
     if (!m_pop3)
         return;
-    int err = mailsession_remove_message(m_folder->fld_session,mail.getNumber());
+    int err = mailsession_remove_message(m_pop3->sto_session,mail.getNumber());
     if (err != MAIL_NO_ERROR) {
         Global::statusMessage(tr("error deleting mail"));
     }
@@ -215,13 +204,13 @@ int POP3wrapper::deleteAllMail(const Folder*) {
     int res = 1;
 
     uint32_t result = 0;
-    int err = mailsession_messages_number(m_folder->fld_session,NULL,&result);
+    int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
     if (err != MAIL_NO_ERROR) {
         Global::statusMessage(tr("Error getting folder info"));
         return 0;
     }
     for (unsigned int i = 0; i < result; ++i) {
-        err = mailsession_remove_message(m_folder->fld_session,i+1);
+        err = mailsession_remove_message(m_pop3->sto_session,i+1);
         if (err != MAIL_NO_ERROR) {
             Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
             res=0;
@@ -238,7 +227,7 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
     target_stat.message_recent = 0;
     if (!m_pop3)
         return;
-    int r = mailsession_status_folder(m_folder->fld_session,0,&target_stat.message_count,
+    int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count,
                                       &target_stat.message_recent,&target_stat.message_unseen);
 }
 
@@ -247,7 +236,7 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) {
     size_t length=0;
     encodedString*res = 0;
     mailmessage * mailmsg = 0;
-    int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
+    int err = mailsession_get_message(m_pop3->sto_session, mail.getNumber(), &mailmsg);
     err = mailmessage_fetch(mailmsg,&target,&length);
     if (mailmsg)
         mailmessage_free(mailmsg);
@@ -261,6 +250,6 @@ const QString&POP3wrapper::getType()const {
     return account->getType();
 }
 
-const QString&POP3wrapper::getName()const {
+const QString&POP3wrapper::getName()const{
     return account->getAccountName();
 }
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index d2b708d..a24b9cf 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -37,7 +37,6 @@ protected:
     void login();
     POP3account *account;
     mailstorage*m_pop3;
-    mailfolder*m_folder;
 };
 
 #endif