9 files changed, 57 insertions, 41 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index c6a44ab..a531976 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,65 +1,66 @@
 #include "accountview.h"
+#include "imapwrapper.h"
 #include "defines.h"
 
 IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
     : AccountViewItem( parent )
 {
     account = a;
     wrapper = new IMAPwrapper( account );
     setPixmap( 0, PIXMAP_IMAPFOLDER );
     setText( 0, account->getAccountName() );
     setOpen( true );
 }
 
 IMAPviewItem::~IMAPviewItem()
 {
     delete wrapper;
 }
 
 IMAPwrapper *IMAPviewItem::getWrapper()
 {
     return wrapper;
 }
 
 void IMAPviewItem::refresh(Maillist&)
 {
     QList<IMAPFolder> *folders = wrapper->listFolders();
     
     QListViewItem *child = firstChild();
     while ( child ) {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     
     IMAPFolder *it;
     for ( it = folders->first(); it; it = folders->next() ) {
         (void) new IMAPfolderItem( it, this );
     }
 }
 
 
 IMAPfolderItem::~IMAPfolderItem() 
 {
     delete folder;
 }
 
 IMAPfolderItem::IMAPfolderItem( IMAPFolder *folderInit, IMAPviewItem *parent )
     : AccountViewItem( parent )
 {
     folder = folderInit;
     imap = parent;
     setPixmap( 0, PIXMAP_IMAPFOLDER );
     setText( 0, folder->getDisplayName() );
 }
 
 void IMAPfolderItem::refresh(Maillist&target) 
 {
     imap->getWrapper()->listMessages( folder->getName(),target );
 }
 
 QString IMAPfolderItem::fetchBody(const RecMail&aMail)
 {
     return imap->getWrapper()->fetchBody(folder->getName(),aMail);
 }
 
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 14d8efa..2bc8023 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -1,67 +1,69 @@
 #ifndef ACCOUNTVIEW_H
 #define ACCOUNTVIEW_H
 
 #include <qlistview.h>
 
 #include "settings.h"
 #include "mailwrapper.h"
 
+class IMAPwrapper;
+
 class AccountViewItem : public QListViewItem
 {
         
 public:
     AccountViewItem( QListView *parent ) : QListViewItem( parent ) {}
     AccountViewItem( QListViewItem *parent ) : QListViewItem( parent ) {}
     virtual void refresh(Maillist&)=0;
     virtual QString fetchBody(const RecMail&)=0;
 };
 
 class IMAPviewItem : public AccountViewItem
 {
 
 public:
     IMAPviewItem( IMAPaccount *a, QListView *parent );
     ~IMAPviewItem();
     virtual void refresh(Maillist&);
     virtual QString fetchBody(const RecMail&){return "";}
     IMAPwrapper *getWrapper();
 
 private:
     IMAPaccount *account;
     IMAPwrapper *wrapper;
     
 };
 
 class IMAPfolderItem : public AccountViewItem
 {
 
 public:
     IMAPfolderItem( IMAPFolder *folder, IMAPviewItem *parent );
     ~IMAPfolderItem();
     virtual void refresh(Maillist&);
     virtual QString fetchBody(const RecMail&);
 
 private:
     IMAPFolder *folder;
     IMAPviewItem *imap;
     
 };
 
 class AccountView : public QListView
 {
     Q_OBJECT
 
 public:
     AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     void populate( QList<Account> list );
     QString fetchBody(const RecMail&aMail);
 
 public slots:
     void refreshAll();
     void refresh(QListViewItem *item);
     
 signals:
     void refreshMailview(Maillist*);    
 };
 
 #endif
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,68 +1,68 @@
 
 #include <stdlib.h>
 
-#include "mailwrapper.h"
+#include "imapwrapper.h"
 
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
 {
     account = a;
 }
 
 void imap_progress( size_t current, size_t maximum )
 {
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
 {
     const char *server, *user, *pass, *mb;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mailbox.latin1();
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
     user = account->getUser().latin1();
     pass = account->getPassword().latin1();
     
     mailimap *imap = mailimap_new( 20, &imap_progress ); 
     if ( imap == NULL ) {
         qDebug("IMAP Memory error");
         return;
     }
 
     /* connect */
     err = mailimap_socket_connect( imap, (char*)server, port );
     if ( err != MAILIMAP_NO_ERROR &&  
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",imap->response);
          mailimap_free( imap );
          return;
     }
     
     /* login */
     err = mailimap_login_simple( imap, (char*)user, (char*)pass );
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error logging in imap: %s",imap->response);
         err = mailimap_close( imap );
         mailimap_free( imap );
         return;
     }
     
     /* select mailbox READONLY for operations */
     err = mailimap_examine( imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",imap->response);
         err = mailimap_logout( imap );
         err = mailimap_close( imap );
         mailimap_free( imap );
         return;
     }
 
diff --git a/noncore/net/mail/imapwrapper.h b/noncore/net/mail/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/imapwrapper.h
@@ -0,0 +1,25 @@
+#ifndef __IMAPWRAPPER
+#define __IMAPWRAPPER
+
+#include "mailwrapper.h"
+#include <libetpan/mailimap.h>
+
+class IMAPwrapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    IMAPwrapper( IMAPaccount *a );
+    QList<IMAPFolder>* listFolders();
+    void listMessages(const QString & mailbox,Maillist&target );
+    QString fetchBody(const QString & mailbox,const RecMail&mail);
+
+protected:
+    RecMail*parse_list_result(mailimap_msg_att*);
+
+private:
+    IMAPaccount *account;
+    
+};
+
+#endif
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index fc12947..7b78499 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -1,68 +1,68 @@
 
 #include <stdlib.h>
 
-#include "mailwrapper.h"
+#include "imapwrapper.h"
 
 
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
 {
     account = a;
 }
 
 void imap_progress( size_t current, size_t maximum )
 {
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::listMessages(const QString&mailbox,Maillist&target )
 {
     const char *server, *user, *pass, *mb;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
     clist *result;
     clistcell *current;
     mailimap_fetch_att *fetchAtt,*fetchAttFlags,*fetchAttDate;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     
     mb = mailbox.latin1();
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
     user = account->getUser().latin1();
     pass = account->getPassword().latin1();
     
     mailimap *imap = mailimap_new( 20, &imap_progress ); 
     if ( imap == NULL ) {
         qDebug("IMAP Memory error");
         return;
     }
 
     /* connect */
     err = mailimap_socket_connect( imap, (char*)server, port );
     if ( err != MAILIMAP_NO_ERROR &&  
          err != MAILIMAP_NO_ERROR_AUTHENTICATED &&
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
          qDebug("error connecting server: %s",imap->response);
          mailimap_free( imap );
          return;
     }
     
     /* login */
     err = mailimap_login_simple( imap, (char*)user, (char*)pass );
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error logging in imap: %s",imap->response);
         err = mailimap_close( imap );
         mailimap_free( imap );
         return;
     }
     
     /* select mailbox READONLY for operations */
     err = mailimap_examine( imap, (char*)mb);
     if ( err != MAILIMAP_NO_ERROR ) {
         qDebug("error selecting mailbox: %s",imap->response);
         err = mailimap_logout( imap );
         err = mailimap_close( imap );
         mailimap_free( imap );
         return;
     }
 
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h
new file mode 100644
index 0000000..65c36e0
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.h
@@ -0,0 +1,25 @@
+#ifndef __IMAPWRAPPER
+#define __IMAPWRAPPER
+
+#include "mailwrapper.h"
+#include <libetpan/mailimap.h>
+
+class IMAPwrapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    IMAPwrapper( IMAPaccount *a );
+    QList<IMAPFolder>* listFolders();
+    void listMessages(const QString & mailbox,Maillist&target );
+    QString fetchBody(const QString & mailbox,const RecMail&mail);
+
+protected:
+    RecMail*parse_list_result(mailimap_msg_att*);
+
+private:
+    IMAPaccount *account;
+    
+};
+
+#endif
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -1,73 +1,72 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 #include <qpe/applnk.h>
 
 #include <libetpan/mailmime.h>
 #include <libetpan/mailimf.h>
 #include <libetpan/mailsmtp.h>
-#include <libetpan/mailimap.h>
 #include <libetpan/mailstorage.h>
 #include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 
 #include "settings.h"
 
 class Attachment
 {
 public:
     Attachment( DocLnk lnk ); 
     virtual ~Attachment(){}
     const QString getFileName()const{ return doc.file(); }
     const QString getName()const{ return doc.name(); }
     const QString getMimeType()const{ return doc.type(); }
     const QPixmap getPixmap()const{ return doc.pixmap(); }
     const int getSize()const { return size; }
     DocLnk  getDocLnk() { return doc; }
     
 protected:
     DocLnk doc;
     int size;
 
 };
 
 #define FLAG_ANSWERED 0
 #define FLAG_FLAGGED  1
 #define FLAG_DELETED  2
 #define FLAG_SEEN     3
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 /* a class to describe mails in a mailbox */
 class RecMail
 {
 public:
     RecMail();
     virtual ~RecMail(){}
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     void setFlags(const QBitArray&flags){msg_flags = flags;}
     const QBitArray&getFlags()const{return msg_flags;}
 
 #if 0    
     void setDate(const QString&dstring);
     void setDate(const QDateTime&date){mDate = date;}
     QString getDate()const{return mDate.toString();}
 #endif
 protected:
     QString subject,date,from;
     int msg_number;
     QBitArray msg_flags;
 #if 0
     QDateTime mDate;
 #endif
 };
 
@@ -101,83 +100,65 @@ public:
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getReply()const{ return reply; }
     void setReply( const QString&a ) { reply = a; }
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message;
 };
 
 class Folder : public QObject
 {
     Q_OBJECT
 
 public:
     Folder( const QString&init_name );
     const QString&getDisplayName()const { return nameDisplay; }
     const QString&getName()const { return name; }
     virtual bool may_select()const{return true;};    
 
 private:
     QString nameDisplay, name;
     
 };
 
 class IMAPFolder : public Folder
 {
     public:
         IMAPFolder( QString name,bool select=true ) : Folder( name ),m_MaySelect(select) {}
         virtual bool may_select()const{return m_MaySelect;}
     private:
         bool m_MaySelect;
 };
 
 class MailWrapper : public QObject
 {
     Q_OBJECT
 
 public:
     MailWrapper( Settings *s ); 
     void sendMail( Mail mail );
 
 private:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_address_list *parseAddresses(const QString&addr );
     mailimf_fields *createImfFields( Mail *mail );
     mailmime *buildTxtPart( QString str );
     mailmime *buildFilePart( QString filename, QString mimetype );
     void addFileParts( mailmime *message, QList<Attachment> files );
     mailmime *createMimeMail( Mail *mail );
     void smtpSend( mailmime *mail );
     mailimf_field *getField( mailimf_fields *fields, int type );
     clist *createRcptList( mailimf_fields *fields );
     char *getFrom( mailmime *mail );
     SMTPaccount *getAccount( QString from );
     void writeToFile( QString file, mailmime *mail );
     void readFromFile( QString file, char **data, size_t *size );
     static QString mailsmtpError( int err );
     static QString getTmpFile();
 
     Settings *settings;
         
 };
 
-class IMAPwrapper : public QObject
-{
-    Q_OBJECT
-
-public:
-    IMAPwrapper( IMAPaccount *a );
-    QList<IMAPFolder>* listFolders();
-    void listMessages(const QString & mailbox,Maillist&target );
-    QString fetchBody(const QString & mailbox,const RecMail&mail);
-
-protected:
-    RecMail*parse_list_result(mailimap_msg_att*);
-
-private:
-    IMAPaccount *account;
-    
-};
-
 #endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 46a476d..2142cdc 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,39 +1,40 @@
 CONFIG	    += qt warn_on debug quick-app
 
 HEADERS	     = defines.h \
                logindialog.h \
                settings.h \
                editaccounts.h \
                mailwrapper.h \
                composemail.h \
 	           accountview.h \
 	           mainwindow.h \
-	           opiemail.h 
+	           opiemail.h \
+				imapwrapper.h
                
 SOURCES	     = main.cpp \
 	           opiemail.cpp \
 	           mainwindow.cpp \
 	           accountview.cpp \
                composemail.cpp \
                mailwrapper.cpp \
                imapwrapper.cpp \
                addresspicker.cpp \
                editaccounts.cpp \
                logindialog.cpp \
                settings.cpp 
                
 INTERFACES	 = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
                logindialogui.ui \
                composemailui.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 LIBS	    += -lqpe -lopie -letpan -lssl -lcrypto -ldb
 TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index f45eab7..955a8e2 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -1,73 +1,72 @@
 #ifndef MAILWRAPPER_H
 #define MAILWRAPPER_H
 
 #include <qpe/applnk.h>
 
 #include <libetpan/mailmime.h>
 #include <libetpan/mailimf.h>
 #include <libetpan/mailsmtp.h>
-#include <libetpan/mailimap.h>
 #include <libetpan/mailstorage.h>
 #include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 
 #include "settings.h"
 
 class Attachment
 {
 public:
     Attachment( DocLnk lnk ); 
     virtual ~Attachment(){}
     const QString getFileName()const{ return doc.file(); }
     const QString getName()const{ return doc.name(); }
     const QString getMimeType()const{ return doc.type(); }
     const QPixmap getPixmap()const{ return doc.pixmap(); }
     const int getSize()const { return size; }
     DocLnk  getDocLnk() { return doc; }
     
 protected:
     DocLnk doc;
     int size;
 
 };
 
 #define FLAG_ANSWERED 0
 #define FLAG_FLAGGED  1
 #define FLAG_DELETED  2
 #define FLAG_SEEN     3
 #define FLAG_DRAFT    4
 #define FLAG_RECENT   5
 
 /* a class to describe mails in a mailbox */
 class RecMail
 {
 public:
     RecMail();
     virtual ~RecMail(){}
 
     const int getNumber()const{return msg_number;}
     void setNumber(int number){msg_number=number;}
     const QString&getDate()const{ return date; }
     void setDate( const QString&a ) { date = a; }
     const QString&getFrom()const{ return from; }
     void setFrom( const QString&a ) { from = a; }
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     void setFlags(const QBitArray&flags){msg_flags = flags;}
     const QBitArray&getFlags()const{return msg_flags;}
 
 #if 0    
     void setDate(const QString&dstring);
     void setDate(const QDateTime&date){mDate = date;}
     QString getDate()const{return mDate.toString();}
 #endif
 protected:
     QString subject,date,from;
     int msg_number;
     QBitArray msg_flags;
 #if 0
     QDateTime mDate;
 #endif
 };
 
@@ -101,83 +100,65 @@ public:
     const QString&getSubject()const { return subject; }
     void setSubject( const QString&s ) { subject = s; }
     const QString&getReply()const{ return reply; }
     void setReply( const QString&a ) { reply = a; }
 
 private:
     QList<Attachment> attList;
     QString name, mail, to, cc, bcc, reply, subject, message;
 };
 
 class Folder : public QObject
 {
     Q_OBJECT
 
 public:
     Folder( const QString&init_name );
     const QString&getDisplayName()const { return nameDisplay; }
     const QString&getName()const { return name; }
     virtual bool may_select()const{return true;};    
 
 private:
     QString nameDisplay, name;
     
 };
 
 class IMAPFolder : public Folder
 {
     public:
         IMAPFolder( QString name,bool select=true ) : Folder( name ),m_MaySelect(select) {}
         virtual bool may_select()const{return m_MaySelect;}
     private:
         bool m_MaySelect;
 };
 
 class MailWrapper : public QObject
 {
     Q_OBJECT
 
 public:
     MailWrapper( Settings *s ); 
     void sendMail( Mail mail );
 
 private:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_address_list *parseAddresses(const QString&addr );
     mailimf_fields *createImfFields( Mail *mail );
     mailmime *buildTxtPart( QString str );
     mailmime *buildFilePart( QString filename, QString mimetype );
     void addFileParts( mailmime *message, QList<Attachment> files );
     mailmime *createMimeMail( Mail *mail );
     void smtpSend( mailmime *mail );
     mailimf_field *getField( mailimf_fields *fields, int type );
     clist *createRcptList( mailimf_fields *fields );
     char *getFrom( mailmime *mail );
     SMTPaccount *getAccount( QString from );
     void writeToFile( QString file, mailmime *mail );
     void readFromFile( QString file, char **data, size_t *size );
     static QString mailsmtpError( int err );
     static QString getTmpFile();
 
     Settings *settings;
         
 };
 
-class IMAPwrapper : public QObject
-{
-    Q_OBJECT
-
-public:
-    IMAPwrapper( IMAPaccount *a );
-    QList<IMAPFolder>* listFolders();
-    void listMessages(const QString & mailbox,Maillist&target );
-    QString fetchBody(const QString & mailbox,const RecMail&mail);
-
-protected:
-    RecMail*parse_list_result(mailimap_msg_att*);
-
-private:
-    IMAPaccount *account;
-    
-};
-
 #endif