3 files changed, 29 insertions, 5 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index b609aa7..5dc4cab 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -29,6 +29,7 @@ public:
     virtual void answeredMail(const RecMail&mail)=0;
     virtual void cleanMimeCache(){};
     virtual int deleteAllMail(const Folder*){return 1;}
+    virtual int deleteMbox(const Folder*){return 1;}
     
     /* mail box methods */
     /* parameter is the box to create.
@@ -36,7 +37,6 @@ public:
      * them has to be appended automatic.
      */
     virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;}
-    virtual int deleteMbox(const Folder*){return 1;}
 
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index b85fbf6..2e70dee 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -206,9 +206,6 @@ void POP3wrapper::logout()
 
 QList<Folder>* POP3wrapper::listFolders()
 {
-    /* TODO: integrate MH directories 
-       but not before version 0.1 ;)
-    */
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX","/");
@@ -222,10 +219,36 @@ void POP3wrapper::deleteMail(const RecMail&mail)
     if (!m_pop3) return;
     int err = mailpop3_dele(m_pop3,mail.getNumber());
     if (err != MAILPOP3_NO_ERROR) {
-        qDebug("error deleting mail");
+        Global::statusMessage(tr("error deleting mail"));
     }
 }
 
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
+
+int POP3wrapper::deleteAllMail(const Folder*)
+{
+    login();
+    if (!m_pop3) return 0;
+    carray * messages = 0;
+    
+    /* if connected this info is cached! */
+    int err = 0;
+    mailpop3_list( m_pop3, &messages );
+    
+    int res = 1;
+    for (unsigned int i = 0; messages!=0 && i < carray_count(messages);++i) {
+        mailpop3_msg_info *info;
+        err = mailpop3_get_msg_info(m_pop3,i+1,&info);
+        if (info->msg_deleted)
+            continue;
+        err = mailpop3_dele(m_pop3,i+1);
+        if (err != MAILPOP3_NO_ERROR) {
+            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            res = 0;
+            break;
+        }
+    }
+    return res;
+}
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index 7502720..2efffdd 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -19,6 +19,7 @@ public:
 
     virtual void deleteMail(const RecMail&mail);
     virtual void answeredMail(const RecMail&mail);
+    virtual int deleteAllMail(const Folder*);
 
     virtual RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );