1 files changed, 16 insertions, 27 deletions

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
@@ -16,3 +16,2 @@ POP3wrapper::POP3wrapper( POP3account *a )
     m_pop3 = NULL;
-    m_folder = NULL;
     msgTempName = a->getFileName()+"_msg_cache";
@@ -60,3 +59,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
         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);
@@ -96,3 +95,4 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
 
-void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) {
+void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) 
+{
     login();
@@ -101,4 +101,4 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) {
     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));
@@ -106,3 +106,4 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) {
 
-void POP3wrapper::login() {
+void POP3wrapper::login()
+{
     if (account->getOffline())
@@ -159,12 +160,3 @@ void POP3wrapper::login() {
 
-
-    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) {
@@ -172,4 +164,2 @@ void POP3wrapper::login() {
         Global::statusMessage(tr("Error initializing folder"));
-        mailfolder_free(m_folder);
-        m_folder = 0;
         mailstorage_free(m_pop3);
@@ -179,3 +169,4 @@ void POP3wrapper::login() {
 
-void POP3wrapper::logout() {
+void POP3wrapper::logout() 
+{
     int err = MAILPOP3_NO_ERROR;
@@ -183,4 +174,2 @@ void POP3wrapper::logout() {
         return;
-    mailfolder_free(m_folder);
-    m_folder = 0;
     mailstorage_free(m_pop3);
@@ -202,3 +191,3 @@ void POP3wrapper::deleteMail(const RecMail&mail) {
         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) {
@@ -217,3 +206,3 @@ int POP3wrapper::deleteAllMail(const Folder*) {
     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) {
@@ -223,3 +212,3 @@ int POP3wrapper::deleteAllMail(const Folder*) {
     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) {
@@ -240,3 +229,3 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
         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);
@@ -249,3 +238,3 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) {
     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);
@@ -263,3 +252,3 @@ const QString&POP3wrapper::getType()const {
 
-const QString&POP3wrapper::getName()const {
+const QString&POP3wrapper::getName()const{
     return account->getAccountName();