12 files changed, 58 insertions, 16 deletions
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 80d0b52..3dd2fce 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -22,7 +22,7 @@ AbstractMail* AbstractMail::getWrapper(POP3account *a)
 }
 
-AbstractMail* AbstractMail::getWrapper(const QString&a)
+AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
 {
-    return new MBOXwrapper(a);
+    return new MBOXwrapper(a,name);
 }
 
@@ -100,2 +100,7 @@ QString AbstractMail::defaultLocalfolder()
     return f;
 }
+
+/* temporary - will be removed when implemented in all classes */
+void AbstractMail::deleteMails(const QString &,QList<RecMail> &)
+{
+}
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h
index 9770991..15d83cb 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.h
+++ b/noncore/net/mail/libmailwrapper/abstractmail.h
@@ -32,4 +32,5 @@ public:
     virtual void answeredMail(const RecMail&mail)=0;
     virtual int deleteAllMail(const Folder*)=0;
+    virtual void deleteMails(const QString & FolderName,QList<RecMail> &target);
     virtual int deleteMbox(const Folder*)=0;
     virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
@@ -47,9 +48,10 @@ public:
     static AbstractMail* getWrapper(POP3account *a);
     /* mbox only! */
-    static AbstractMail* getWrapper(const QString&a);
+    static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders");
 
     static QString defaultLocalfolder();
     
     virtual const QString&getType()const=0;
+    virtual const QString&getName()const=0;
 
 protected:
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index d252159..bb74de9 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -30,4 +30,5 @@ void IMAPwrapper::login()
     int err = MAILIMAP_NO_ERROR;
 
+    if (account->getOffline()) return;
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
@@ -1007,4 +1008,9 @@ const QString&IMAPwrapper::getType()const
 }
 
+const QString&IMAPwrapper::getName()const
+{
+    return account->getAccountName();
+}
+
 encodedString* IMAPwrapper::fetchRawBody(const RecMail&mail)
 {
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
index b246f58..b2bd7e9 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.h
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -46,4 +46,6 @@ public:
     virtual void logout();
     virtual const QString&getType()const;
+    virtual const QString&getName()const;
+
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
index bc496f7..97f301e 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp
@@ -9,6 +9,6 @@
 const QString MBOXwrapper::wrapperType="MBOX";
 
-MBOXwrapper::MBOXwrapper(const QString & mbox_dir)
-    : Genericwrapper(),MBOXPath(mbox_dir)
+MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name)
+    : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name)
 {
     QDir dir(MBOXPath);
@@ -331,2 +331,7 @@ const QString&MBOXwrapper::getType()const
     return wrapperType;
 }
+
+const QString&MBOXwrapper::getName()const
+{
+    return MBOXName;
+}
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h
index 2794014..194ff86 100644
--- a/noncore/net/mail/libmailwrapper/mboxwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h
@@ -14,5 +14,5 @@ class MBOXwrapper : public Genericwrapper
     Q_OBJECT
 public:
-    MBOXwrapper(const QString & dir);
+    MBOXwrapper(const QString & dir,const QString&name);
     virtual ~MBOXwrapper();
     
@@ -33,11 +33,13 @@ public:
 
     virtual encodedString* fetchRawBody(const RecMail&mail);
-    virtual void deleteMails(const QString & mailbox,QList<RecMail> &target);
+    virtual void deleteMails(const QString & FolderName,QList<RecMail> &target);
     virtual int deleteAllMail(const Folder*);
     virtual const QString&getType()const;
+    virtual const QString&getName()const;
 
 protected:
     static void deleteMails(mailmbox_folder*f,QList<RecMail> &target);
     QString MBOXPath;
+    QString MBOXName;
     static const QString wrapperType;
 };
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index cceb22e..67bde38 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -109,4 +109,5 @@ void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
 void POP3wrapper::login()
 {
+    if (account->getOffline()) return;
     /* we'll hold the line */
     if ( m_pop3 != NULL ) return;
@@ -250,2 +251,7 @@ const QString&POP3wrapper::getType()const
     return account->getType();
 }
+
+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 f0307b6..d2b708d 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -31,4 +31,5 @@ public:
     virtual void logout();
     virtual const QString&getType()const;
+    virtual const QString&getName()const;
     static void pop3_progress( size_t current, size_t maximum );
 
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index c5187f5..02a80a3 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -169,4 +169,6 @@ void IMAPaccount::read()
     prefix = conf->readEntry("MailPrefix","");
     if (prefix.isNull()) prefix = "";
+    offline = conf->readBoolEntry("Offline",false);
+    delete conf;
 }
 
@@ -185,5 +187,7 @@ void IMAPaccount::save()
     conf->writeEntryCrypt( "Password", password );
     conf->writeEntry( "MailPrefix",prefix);
+    conf->writeEntry( "Offline",offline);
     conf->write();
+    delete conf;
 }
 
@@ -239,4 +243,6 @@ void POP3account::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
+    offline = conf->readBoolEntry("Offline",false);
+    delete conf;
 }
 
@@ -254,5 +260,7 @@ void POP3account::save()
     conf->writeEntry( "User", user );
     conf->writeEntryCrypt( "Password", password );
+    conf->writeEntry( "Offline",offline);
     conf->write();
+    delete conf;
 }
 
@@ -314,4 +322,5 @@ void SMTPaccount::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
+    delete conf;
 }
 
@@ -331,4 +340,5 @@ void SMTPaccount::save()
     conf->writeEntryCrypt( "Password", password );
     conf->write();
+    delete conf;
 }
 
@@ -387,4 +397,5 @@ void NNTPaccount::read()
     user = conf->readEntry( "User" );
     password = conf->readEntryCrypt( "Password" );
+    delete conf;
 }
 
@@ -404,4 +415,5 @@ void NNTPaccount::save()
     conf->writeEntryCrypt( "Password", password );
     conf->write();
+    delete conf;
 }
 
diff --git a/noncore/net/mail/libmailwrapper/settings.h b/noncore/net/mail/libmailwrapper/settings.h
index caa5dfc..2104997 100644
--- a/noncore/net/mail/libmailwrapper/settings.h
+++ b/noncore/net/mail/libmailwrapper/settings.h
@@ -31,4 +31,7 @@ public:
     void setSSL( bool b ) { ssl = b; }
     bool getSSL() { return ssl; }
+    
+    void setOffline(bool b) {offline = b;}
+    bool getOffline()const{return offline;}
 
     virtual QString getFileName() { return accountName; }
@@ -39,5 +42,5 @@ protected:
     QString accountName, type, server, port, user, password;
     bool ssl;
-    
+    bool offline;
 };
 
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 4764b77..281b88e 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -490,5 +490,5 @@ void SMTPwrapper::storeMail(const char*mail, size_t length, const QString&box)
     if (!mail) return;
     QString localfolders = AbstractMail::defaultLocalfolder();
-    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
+    AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     wrap->storeMessage(mail,length,box);
     delete wrap;
@@ -517,9 +517,7 @@ void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
         return;
     }
-    QString tmp = data;
-    tmp.replace(QRegExp("\r+",true,false),"");
     msg = 0;
     if (later) {
-        storeMail((char*)tmp.data(),tmp.length(),"Outgoing");
+        storeMail(data,size,"Outgoing");
         if (data) free( data );
         Config cfg( "mail" );
@@ -637,5 +635,5 @@ void SMTPwrapper::sendMail(const Mail&mail,SMTPaccount*aSmtp,bool later )
 }
 
-int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
+int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which)
 {
     size_t curTok = 0;
@@ -686,5 +684,5 @@ bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 
     QString localfolders = AbstractMail::defaultLocalfolder();
-    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
+    AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index 04fc4b0..7dcdbfd 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -11,5 +11,5 @@
 
 class Mail;
-class MBOXwrapper;
+class AbstractMail;
 class RecMail;
 class Attachment;
@@ -60,5 +60,5 @@ protected:
     Settings *settings;
     
-    int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
+    int sendQueuedMail(AbstractMail*wrap,SMTPaccount*smtp,RecMail*which);
 
     int m_queuedMail;