5 files changed, 14 insertions, 15 deletions
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -10,7 +10,7 @@
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 Attachment::Attachment( DocLnk lnk )
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -3,12 +3,12 @@
 #include <qpe/applnk.h>
-#include <mailmime.h>
+#include <libetpan/mailmime.h>
-#include <mailimf.h>
+#include <libetpan/mailimf.h>
-#include <mailsmtp.h>
+#include <libetpan/mailsmtp.h>
-#include <mailimap.h>
+#include <libetpan/mailimap.h>
-#include <mailstorage.h>
+#include <libetpan/mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index c913826..46a476d 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -33,7 +33,6 @@ INTERFACES	 = editaccountsui.ui \
               composemailui.ui
 INCLUDEPATH += $(OPIEDIR)/include
-INCLUDEPATH += $(OPIEDIR)/include/libetpan
        LIBS    += -lqpe -lopie -letpan -lssl -lcrypto -ldb
 TARGET       = opiemail
diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/mailwrapper.cpp
+++ b/noncore/net/mail/mailwrapper.cpp
@@ -10,7 +10,7 @@
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 Attachment::Attachment( DocLnk lnk )
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -3,12 +3,12 @@
 #include <qpe/applnk.h>
-#include <mailmime.h>
+#include <libetpan/mailmime.h>
-#include <mailimf.h>
+#include <libetpan/mailimf.h>
-#include <mailsmtp.h>
+#include <libetpan/mailsmtp.h>
-#include <mailimap.h>
+#include <libetpan/mailimap.h>
-#include <mailstorage.h>
+#include <libetpan/mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>

diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index 17bed65..13a3fd9 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -10,7 +10,7 @@
10		10
11	#include "mailwrapper.h"	11	#include "mailwrapper.h"
12	#include "logindialog.h"	12	#include "logindialog.h"
13	#include "mail.h"	13	//#include "mail.h"
14	#include "defines.h"	14	#include "defines.h"
15		15
16	Attachment::Attachment( DocLnk lnk )	16	Attachment::Attachment( DocLnk lnk )


diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h index 3de28a0..f45eab7 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.h +++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -3,12 +3,12 @@
3		3
4	#include <qpe/applnk.h>	4	#include <qpe/applnk.h>
5		5
6	#include <mailmime.h>	6	#include <libetpan/mailmime.h>
7	#include <mailimf.h>	7	#include <libetpan/mailimf.h>
8	#include <mailsmtp.h>	8	#include <libetpan/mailsmtp.h>
9	#include <mailimap.h>	9	#include <libetpan/mailimap.h>
10	#include <mailstorage.h>	10	#include <libetpan/mailstorage.h>
11	#include <maildriver.h>	11	#include <libetpan/maildriver.h>
12	#include <qbitarray.h>	12	#include <qbitarray.h>
13	#include <qdatetime.h>	13	#include <qdatetime.h>
14		14


diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index c913826..46a476d 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro
@@ -33,7 +33,6 @@ INTERFACES = editaccountsui.ui \
33	composemailui.ui	33	composemailui.ui
34		34
35	INCLUDEPATH += $(OPIEDIR)/include	35	INCLUDEPATH += $(OPIEDIR)/include
36	INCLUDEPATH += $(OPIEDIR)/include/libetpan
37	LIBS += -lqpe -lopie -letpan -lssl -lcrypto -ldb	36	LIBS += -lqpe -lopie -letpan -lssl -lcrypto -ldb
38	TARGET = opiemail	37	TARGET = opiemail
39		38


diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp index 17bed65..13a3fd9 100644 --- a/noncore/net/mail/mailwrapper.cpp +++ b/noncore/net/mail/mailwrapper.cpp
@@ -10,7 +10,7 @@
10		10
11	#include "mailwrapper.h"	11	#include "mailwrapper.h"
12	#include "logindialog.h"	12	#include "logindialog.h"
13	#include "mail.h"	13	//#include "mail.h"
14	#include "defines.h"	14	#include "defines.h"
15		15
16	Attachment::Attachment( DocLnk lnk )	16	Attachment::Attachment( DocLnk lnk )


diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h index 3de28a0..f45eab7 100644 --- a/noncore/net/mail/mailwrapper.h +++ b/noncore/net/mail/mailwrapper.h
@@ -3,12 +3,12 @@
3		3
4	#include <qpe/applnk.h>	4	#include <qpe/applnk.h>
5		5
6	#include <mailmime.h>	6	#include <libetpan/mailmime.h>
7	#include <mailimf.h>	7	#include <libetpan/mailimf.h>
8	#include <mailsmtp.h>	8	#include <libetpan/mailsmtp.h>
9	#include <mailimap.h>	9	#include <libetpan/mailimap.h>
10	#include <mailstorage.h>	10	#include <libetpan/mailstorage.h>
11	#include <maildriver.h>	11	#include <libetpan/maildriver.h>
12	#include <qbitarray.h>	12	#include <qbitarray.h>
13	#include <qdatetime.h>	13	#include <qdatetime.h>
14		14