Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 32 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.h | 2 |
5 files changed, 40 insertions, 6 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h index bc8938f..0a1719d 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.h +++ b/noncore/net/mail/libmailwrapper/abstractmail.h | |||
@@ -17,14 +17,14 @@ class AbstractMail:public QObject | |||
17 | public: | 17 | public: |
18 | AbstractMail(){}; | 18 | AbstractMail(){}; |
19 | virtual ~AbstractMail(){} | 19 | virtual ~AbstractMail(){} |
20 | virtual QList<Folder>* listFolders()=0; | 20 | virtual QList<Folder>* listFolders()=0; |
21 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; | 21 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target )=0; |
22 | virtual RecBody fetchBody(const RecMail&mail)=0; | 22 | virtual RecBody fetchBody(const RecMail&mail)=0; |
23 | virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false)=0; | ||
24 | virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0; | 23 | virtual QString fetchPart(const RecMail&mail,const RecPart&part)=0; |
24 | virtual void deleteMail(const RecMail&mail)=0; | ||
25 | 25 | ||
26 | static AbstractMail* getWrapper(IMAPaccount *a); | 26 | static AbstractMail* getWrapper(IMAPaccount *a); |
27 | static AbstractMail* getWrapper(POP3account *a); | 27 | static AbstractMail* getWrapper(POP3account *a); |
28 | }; | 28 | }; |
29 | 29 | ||
30 | #endif | 30 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 3222c7e..a01a2a9 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -693,6 +693,38 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which) | |||
693 | } | 693 | } |
694 | 694 | ||
695 | QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part) | 695 | QString IMAPwrapper::fetchPart(const RecMail&mail,const RecPart&part) |
696 | { | 696 | { |
697 | return fetchPart(mail,part.Positionlist(),false); | 697 | return fetchPart(mail,part.Positionlist(),false); |
698 | } | 698 | } |
699 | |||
700 | void IMAPwrapper::deleteMail(const RecMail&mail) | ||
701 | { | ||
702 | mailimap_flag_list*flist; | ||
703 | mailimap_set *set; | ||
704 | mailimap_store_att_flags * store_flags; | ||
705 | int err; | ||
706 | login(); | ||
707 | if (!m_imap) { | ||
708 | return; | ||
709 | } | ||
710 | const char *mb = mail.getMbox().latin1(); | ||
711 | err = mailimap_select( m_imap, (char*)mb); | ||
712 | if ( err != MAILIMAP_NO_ERROR ) { | ||
713 | qDebug("error selecting mailbox for delete: %s",m_imap->imap_response); | ||
714 | return; | ||
715 | } | ||
716 | flist = mailimap_flag_list_new_empty(); | ||
717 | mailimap_flag_list_add(flist,mailimap_flag_new_deleted()); | ||
718 | store_flags = mailimap_store_att_flags_new_set_flags(flist); | ||
719 | set = mailimap_set_new_single(mail.getNumber()); | ||
720 | err = mailimap_store(m_imap,set,store_flags); | ||
721 | if (err != MAILIMAP_NO_ERROR) { | ||
722 | qDebug("error deleting mail: %s",m_imap->imap_response); | ||
723 | return; | ||
724 | } | ||
725 | err = mailimap_expunge(m_imap); | ||
726 | if (err != MAILIMAP_NO_ERROR) { | ||
727 | qDebug("error deleting mail: %s",m_imap->imap_response); | ||
728 | } | ||
729 | qDebug("Delete successfull"); | ||
730 | } | ||
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index f88457a..4f4d575 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h | |||
@@ -20,20 +20,23 @@ class IMAPwrapper : public AbstractMail | |||
20 | public: | 20 | public: |
21 | IMAPwrapper( IMAPaccount *a ); | 21 | IMAPwrapper( IMAPaccount *a ); |
22 | virtual ~IMAPwrapper(); | 22 | virtual ~IMAPwrapper(); |
23 | virtual QList<Folder>* listFolders(); | 23 | virtual QList<Folder>* listFolders(); |
24 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target ); | 24 | virtual void listMessages(const QString & mailbox,QList<RecMail>&target ); |
25 | virtual RecBody fetchBody(const RecMail&mail); | 25 | virtual RecBody fetchBody(const RecMail&mail); |
26 | virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false); | ||
27 | virtual QString fetchPart(const RecMail&mail,const RecPart&part); | 26 | virtual QString fetchPart(const RecMail&mail,const RecPart&part); |
27 | virtual void deleteMail(const RecMail&mail); | ||
28 | |||
28 | static void imap_progress( size_t current, size_t maximum ); | 29 | static void imap_progress( size_t current, size_t maximum ); |
29 | 30 | ||
30 | protected: | 31 | protected: |
31 | RecMail*parse_list_result(mailimap_msg_att*); | 32 | RecMail*parse_list_result(mailimap_msg_att*); |
32 | void login(); | 33 | void login(); |
33 | void logout(); | 34 | void logout(); |
35 | |||
36 | virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false); | ||
34 | 37 | ||
35 | void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); | 38 | void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); |
36 | void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>()); | 39 | void searchBodyText(const RecMail&mail,mailimap_body_type_mpart*mailDescription,RecBody&target_body,int current_recursion=0,QValueList<int>recList=QValueList<int>()); |
37 | 40 | ||
38 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); | 41 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); |
39 | void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which); | 42 | void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which); |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 903ef4d..62523bf 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -276,15 +276,14 @@ QList<Folder>* POP3wrapper::listFolders() | |||
276 | folders->setAutoDelete( true ); | 276 | folders->setAutoDelete( true ); |
277 | Folder*inb=new Folder("INBOX"); | 277 | Folder*inb=new Folder("INBOX"); |
278 | folders->append(inb); | 278 | folders->append(inb); |
279 | return folders; | 279 | return folders; |
280 | } | 280 | } |
281 | 281 | ||
282 | QString POP3wrapper::fetchPart(const RecMail&,const QValueList<int>&,bool) | 282 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) |
283 | { | 283 | { |
284 | return ""; | 284 | return ""; |
285 | } | 285 | } |
286 | 286 | ||
287 | QString POP3wrapper::fetchPart(const RecMail&,const RecPart&) | 287 | void POP3wrapper::deleteMail(const RecMail&) |
288 | { | 288 | { |
289 | return ""; | ||
290 | } | 289 | } |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h index 3b24564..ef972c8 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.h +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h | |||
@@ -15,14 +15,14 @@ class POP3wrapper : public AbstractMail | |||
15 | public: | 15 | public: |
16 | POP3wrapper( POP3account *a ); | 16 | POP3wrapper( POP3account *a ); |
17 | virtual ~POP3wrapper(); | 17 | virtual ~POP3wrapper(); |
18 | /* mailbox will be ignored */ | 18 | /* mailbox will be ignored */ |
19 | virtual void listMessages(const QString & mailbox, QList<RecMail> &target ); | 19 | virtual void listMessages(const QString & mailbox, QList<RecMail> &target ); |
20 | virtual QList<Folder>* listFolders(); | 20 | virtual QList<Folder>* listFolders(); |
21 | virtual QString fetchPart(const RecMail&mail,const QValueList<int>&path,bool internal_call=false); | ||
22 | virtual QString fetchPart(const RecMail&mail,const RecPart&part); | 21 | virtual QString fetchPart(const RecMail&mail,const RecPart&part); |
22 | virtual void deleteMail(const RecMail&mail); | ||
23 | 23 | ||
24 | RecBody fetchBody( const RecMail &mail ); | 24 | RecBody fetchBody( const RecMail &mail ); |
25 | static void pop3_progress( size_t current, size_t maximum ); | 25 | static void pop3_progress( size_t current, size_t maximum ); |
26 | 26 | ||
27 | protected: | 27 | protected: |
28 | void login(); | 28 | void login(); |