adapt build system to lib etc and get it build

9 files changed, 99 insertions, 45 deletions

diff --git a/noncore/net/mail/config.in b/noncore/net/mail/config.in
index 43ecc6f..b5173ae 100644
--- a/noncore/net/mail/config.in
+++ b/noncore/net/mail/config.in
@@ -2,3 +2,3 @@
     boolean "opie-mail3 (a mail client)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LIBMAILWRAPPER
diff --git a/noncore/net/mail/libmailwrapper/.cvsignore b/noncore/net/mail/libmailwrapper/.cvsignore
new file mode 100644
index 0000000..581c299
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/.cvsignore
@@ -0,0 +1,6 @@
+logindialogui.cpp
+logindialogui.h
+sendmailprogressui.cpp
+sendmailprogressui.h
+.moc
+Makefile
diff --git a/noncore/net/mail/libmailwrapper/config.in b/noncore/net/mail/libmailwrapper/config.in
new file mode 100644
index 0000000..790891e
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/config.in
@@ -0,0 +1,4 @@
+ config LIBMAILWRAPPER
+    boolean "libmailwrapper ( wrapper arround libetpan needed by mail3"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
new file mode 100644
index 0000000..4b4a4f1
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -0,0 +1,44 @@
+TEMPLATE        = lib
+CONFIG        += qt warn_on debug 
+
+HEADERS         = mailwrapper.h \
+               imapwrapper.h \
+               mailtypes.h \
+               pop3wrapper.h \
+               abstractmail.h  \
+               smtpwrapper.h \
+               genericwrapper.h \
+               mboxwrapper.h \
+		settings.h \
+		logindialog.h \
+		sendmailprogress.h
+               
+SOURCES         = imapwrapper.cpp \
+               mailwrapper.cpp \
+               mailtypes.cpp \
+               pop3wrapper.cpp \
+               abstractmail.cpp \
+               smtpwrapper.cpp \
+               genericwrapper.cpp \
+               mboxwrapper.cpp \
+		settings.cpp \
+		logindialog.cpp \
+		sendmailprogress.cpp
+
+INTERFACES 	= logindialogui.ui \
+		  sendmailprogressui.ui
+               
+
+INCLUDEPATH += $(OPIEDIR)/include
+
+CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
+contains( CONFTEST, y ){
+    LIBS        += -lqpe -letpan -lssl -lcrypto -liconv
+}else{
+    LIBS        += -lqpe -letpan -lssl -lcrypto  
+}
+
+DESTDIR         = $(OPIEDIR)/lib$(PROJMAK)
+TARGET       = mailwrapper
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 9398823..75b9343 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -8,6 +8,17 @@
 
 #include "mailwrapper.h"
-#include "logindialog.h"
-#include "defines.h"
+//#include "logindialog.h"
+//#include "defines.h"
+
+#define UNDEFINED 64
+#define MAXLINE  76
+#define UTF16MASK       0x03FFUL
+#define UTF16SHIFT      10
+#define UTF16BASE       0x10000UL
+#define UTF16HIGHSTART  0xD800UL
+#define UTF16HIGHEND    0xDBFFUL
+#define UTF16LOSTART    0xDC00UL
+#define UTF16LOEND      0xDFFFUL
+
 
 Attachment::Attachment( DocLnk lnk )
diff --git a/noncore/net/mail/libmailwrapper/settings.cpp b/noncore/net/mail/libmailwrapper/settings.cpp
index 17aa1b0..c5187f5 100644
--- a/noncore/net/mail/libmailwrapper/settings.cpp
+++ b/noncore/net/mail/libmailwrapper/settings.cpp
@@ -5,5 +5,15 @@
 
 #include "settings.h"
-#include "defines.h"
+//#include "defines.h"
+
+#define IMAP_PORT           "143"
+#define IMAP_SSL_PORT       "993"
+#define SMTP_PORT           "25"
+#define SMTP_SSL_PORT       "465"
+#define POP3_PORT           "110"
+#define POP3_SSL_PORT       "995"
+#define NNTP_PORT           "119"
+#define NNTP_SSL_PORT       "563"
+
 
 Settings::Settings()
@@ -63,5 +73,5 @@ void Settings::updateAccounts()
         accounts.append( account );
     }
-    
+
     QStringList nntp = dir.entryList( "nntp-*" );
     for ( it = nntp.begin(); it != nntp.end(); it++ ) {
@@ -70,5 +80,5 @@ void Settings::updateAccounts()
         accounts.append( account );
     }
-    
+
     readAccounts();
 }
@@ -76,5 +86,5 @@ void Settings::updateAccounts()
 void Settings::saveAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
 
@@ -86,5 +96,5 @@ void Settings::saveAccounts()
 void Settings::readAccounts()
 {
-    checkDirectory(); 
+    checkDirectory();
     Account *it;
 
@@ -131,5 +141,5 @@ QString IMAPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
@@ -165,5 +175,5 @@ void IMAPaccount::save()
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "IMAP Account" );
@@ -208,5 +218,5 @@ QString POP3account::getUniqueFileName()
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
@@ -235,5 +245,5 @@ void POP3account::save()
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "POP3 Account" );
@@ -282,5 +292,5 @@ QString SMTPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
@@ -310,5 +320,5 @@ void SMTPaccount::save()
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "SMTP Account" );
@@ -355,5 +365,5 @@ QString NNTPaccount::getUniqueFileName()
     int num = 0;
     QString unique;
-    
+
     QDir dir( (QString) getenv( "HOME" ) + "/Applications/opiemail" );
 
@@ -383,5 +393,5 @@ void NNTPaccount::save()
     qDebug( "saving " + getFileName() );
     Settings::checkDirectory();
-    
+
     Config *conf = new Config( getFileName(), Config::File );
     conf->setGroup( "NNTP Account" );
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 7e03af9..b9c4ff2 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -18,7 +18,9 @@
 #include "logindialog.h"
 #include "mailtypes.h"
-#include "defines.h"
+//#include "defines.h"
 #include "sendmailprogress.h"
 
+#define USER_AGENT          "OpieMail v0.1"
+
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index 2c15a7b..69e1450 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -2,8 +2,5 @@ CONFIG        += qt warn_on debug quick-app
 
 HEADERS         = defines.h \
-               logindialog.h \
-               settings.h \
                editaccounts.h \
-               mailwrapper.h \
                composemail.h \
                accountview.h \
@@ -12,15 +9,7 @@ HEADERS         = defines.h \
                viewmailbase.h \
                opiemail.h \
-               imapwrapper.h \
-               mailtypes.h \
                mailistviewitem.h \
-               pop3wrapper.h \
-               abstractmail.h  \
                settingsdialog.h \
                statuswidget.h \
-               smtpwrapper.h \
-               genericwrapper.h \
-               mboxwrapper.h \
-               sendmailprogress.h \
                newmaildir.h
                
@@ -30,21 +19,10 @@ SOURCES         = main.cpp \
                accountview.cpp \
                composemail.cpp \
-               mailwrapper.cpp \
-               imapwrapper.cpp \
                addresspicker.cpp \
                editaccounts.cpp \
-               logindialog.cpp \
                viewmail.cpp \
                viewmailbase.cpp \
-               settings.cpp \
-               mailtypes.cpp \
-               pop3wrapper.cpp \
-               abstractmail.cpp \
                settingsdialog.cpp \
                statuswidget.cpp \
-               smtpwrapper.cpp \
-               genericwrapper.cpp \
-               mboxwrapper.cpp \
-               sendmailprogress.cpp \
                newmaildir.cpp
                
@@ -56,9 +34,7 @@ INTERFACES     = editaccountsui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
-               logindialogui.ui \
                composemailui.ui \
                settingsdialogui.ui \
                statuswidgetui.ui \
-               sendmailprogressui.ui \
                newmaildirui.ui
 
@@ -69,5 +45,5 @@ contains( CONFTEST, y ){
     LIBS        += -lqpe -letpan -lssl -lcrypto -lopie -liconv
 }else{
-    LIBS        += -lqpe -letpan -lssl -lcrypto -lopie
+    LIBS        += -lqpe -lopie -llibmailwrapper
 }
 
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 2a74286..6511b1f 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -20,4 +20,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name, flags )
 {
+
     setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );
@@ -117,12 +118,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
     slotAdjustLayout();
-    
+
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
 
     connect( mailView, SIGNAL( mouseButtonClicked(int, QListViewItem *,const QPoint&,int  ) ),this,
-             SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int  ) ) );     
+             SLOT( mailLeftClicked( int, QListViewItem *,const QPoint&,int  ) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int  ) ),this,
-             SLOT( mailHold( int, QListViewItem *,const QPoint&,int  ) ) );         
+             SLOT( mailHold( int, QListViewItem *,const QPoint&,int  ) ) );
     connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));