-rw-r--r-- | kmicromail/libmailwrapper/generatemail.h | 5 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/libmailwrapper.pro | 64 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.cpp | 22 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mhwrapper.h | 6 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.h | 1 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.cpp | 15 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/smtpwrapper.h | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/storemail.h | 2 |
9 files changed, 90 insertions, 29 deletions
diff --git a/kmicromail/libmailwrapper/generatemail.h b/kmicromail/libmailwrapper/generatemail.h index a767b61..b9f8285 100644 --- a/kmicromail/libmailwrapper/generatemail.h +++ b/kmicromail/libmailwrapper/generatemail.h @@ -1,16 +1,17 @@ #ifndef __GENERATE_MAIL_H #define __GENERATE_MAIL_H -#include <qpe/applnk.h> +//#include <qpe/applnk.h> #include <qobject.h> #include <libetpan/clist.h> +#include "mailwrapper.h" #include <opie2/osmartpointer.h> class Mail; class RecMail; -class Attachment; + struct mailimf_fields; struct mailimf_field; struct mailimf_mailbox; diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro new file mode 100644 index 0000000..2b005d8 --- a/dev/null +++ b/kmicromail/libmailwrapper/libmailwrapper.pro @@ -0,0 +1,64 @@ +TEMPLATE = lib +CONFIG += qt warn_on + +HEADERS = mailwrapper.h \ + imapwrapper.h \ + mailtypes.h \ + pop3wrapper.h \ + abstractmail.h \ + smtpwrapper.h \ + genericwrapper.h \ + mboxwrapper.h \ + settings.h \ + logindialog.h \ + sendmailprogress.h \ + statusmail.h \ + mhwrapper.h \ + nntpwrapper.h \ + generatemail.h \ + storemail.h \ + ../qpe/global.h + +SOURCES = imapwrapper.cpp \ + mailwrapper.cpp \ + mailtypes.cpp \ + pop3wrapper.cpp \ + abstractmail.cpp \ + smtpwrapper.cpp \ + genericwrapper.cpp \ + mboxwrapper.cpp \ + settings.cpp \ + logindialog.cpp \ + sendmailprogress.cpp \ + statusmail.cpp \ + mhwrapper.cpp \ + nntpwrapper.cpp \ + generatemail.cpp \ + storemail.cpp \ + ../qpe/global.cpp + +INTERFACES = logindialogui.ui \ + sendmailprogressui.ui + +INCLUDEPATH += .. ../../microkde ../../microkde/kdecore ../libetpan/include +LIBS += -lssl -lcrypto + +#-lqpe -letpan + +DESTDIR = ../../bin +TARGET = micromailwrapper + +DEFINES += DESKTOP_VERSION +unix : { +OBJECTS_DIR = obj/unix +MOC_DIR = moc/unix +} +win32: { +DEFINES += _WIN32_ +LIBS += mfc71u.lib +QMAKE_LINK += /NODEFAULTLIB:LIBC +#QMAKE_LINK += /NODEFAULTLIB:MSVCRT +#QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib +OBJECTS_DIR = obj/win +MOC_DIR = moc/win +} diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h index 2ba908b..88f10da 100644 --- a/kmicromail/libmailwrapper/mailwrapper.h +++ b/kmicromail/libmailwrapper/mailwrapper.h @@ -1,7 +1,7 @@ #ifndef MAILWRAPPER_H #define MAILWRAPPER_H -#include <qpe/applnk.h> +//#include <qpe/applnk.h> #include <qbitarray.h> #include <qdatetime.h> diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp index f4133c0..de6d220 100644 --- a/kmicromail/libmailwrapper/mhwrapper.cpp +++ b/kmicromail/libmailwrapper/mhwrapper.cpp @@ -7,9 +7,9 @@ #include <qmessagebox.h> #include <stdlib.h> #include <qpe/global.h> -#include <oprocess.h> #include <klocale.h> -//#include <opie2/odebug.h> +#include <kglobal.h> +//#include <opie2/odebug.h> using namespace Opie::Core; MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) @@ -315,6 +315,9 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) qDebug("error deleting mail box "); return 0; } + QString delDir = locateLocal( "apps", "kopiemail")+ "localmail"; + qDebug("*****************\ndel %s %s ", delDir.latin1(),tfolder->getName().latin1() ); +#if 0 QString cmd = "rm -rf "+tfolder->getName(); QStringList command; command << "/bin/sh"; @@ -322,32 +325,23 @@ int MHwrapper::deleteMbox(const FolderP&tfolder) command << cmd.latin1(); OProcess *process = new OProcess(); + /* connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT( processEnded(Opie::Core::OProcess*))); connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); - + */ *process << command; removeMboxfailed = false; if(!process->start(OProcess::Block, OProcess::All) ) { qDebug("could not start process "); return 0; } +#endif qDebug("mail box deleted "); return 1; } -void MHwrapper::processEnded(OProcess *p) -{ - if (p) delete p; -} - -void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) -{ - QString lineStr = buffer; - QMessageBox::warning( 0, i18n("Error"), lineStr ,i18n("Ok") ); - removeMboxfailed = true; -} void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) { diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h index d1b7d1f..87f8ca1 100644 --- a/kmicromail/libmailwrapper/mhwrapper.h +++ b/kmicromail/libmailwrapper/mhwrapper.h @@ -9,8 +9,6 @@ class encodedString; struct mailmbox_folder; -namespace Opie {namespace Core {class OProcess;}} - class MHwrapper : public Genericwrapper { Q_OBJECT @@ -45,9 +43,7 @@ public: virtual Account* getAccount() { return 0; }; public slots: - /* for deleting maildirs we are using a system call */ - virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int ); - virtual void processEnded(Opie::Core::OProcess *); + protected: QString buildPath(const QString&p); QString MHPath; diff --git a/kmicromail/libmailwrapper/settings.h b/kmicromail/libmailwrapper/settings.h index 61051dd..79567ef 100644 --- a/kmicromail/libmailwrapper/settings.h +++ b/kmicromail/libmailwrapper/settings.h @@ -8,6 +8,7 @@ /* QT */ #include <qobject.h> #include <qlist.h> +#include <qstringlist.h> #include <qdatetime.h> class Account diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp index dee1477..eb07ef1 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.cpp +++ b/kmicromail/libmailwrapper/smtpwrapper.cpp @@ -10,11 +10,14 @@ #include <qapplication.h> #include <qmessagebox.h> #include <stdlib.h> -#include <qpe/config.h> +#ifndef DESKTOP_VERSION +//#include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> - +#endif #include <libetpan/libetpan.h> #include <klocale.h> +#include <kglobal.h> +#include <kconfig.h> using namespace Opie::Core; @@ -24,7 +27,7 @@ SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) : Generatemail() { m_SmtpAccount = aSmtp; - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); emit queuedMails( m_queuedMail ); @@ -38,8 +41,10 @@ SMTPwrapper::~SMTPwrapper() } void SMTPwrapper::emitQCop( int queued ) { +#ifndef DESKTOP_VERSION QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); env << queued; +#endif } QString SMTPwrapper::mailsmtpError( int errnum ) { @@ -127,7 +132,7 @@ bool SMTPwrapper::smtpSend( mailmime *mail,bool later) { storeMail(data,size,"Outgoing"); if (data) free( data ); - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); cfg.writeEntry( "outgoing", ++m_queuedMail ); emit queuedMails( m_queuedMail ); @@ -447,7 +452,7 @@ bool SMTPwrapper::flushOutbox() { m_SmtpAccount->setUser(oldUser); m_SmtpAccount->setPassword(oldPw); } - Config cfg( "mail" ); + KConfig cfg( locateLocal("config", "kopiemail" ) ); cfg.setGroup( "Status" ); m_queuedMail = 0; cfg.writeEntry( "outgoing", m_queuedMail ); diff --git a/kmicromail/libmailwrapper/smtpwrapper.h b/kmicromail/libmailwrapper/smtpwrapper.h index ec42b56..bdca000 100644 --- a/kmicromail/libmailwrapper/smtpwrapper.h +++ b/kmicromail/libmailwrapper/smtpwrapper.h @@ -2,7 +2,7 @@ #ifndef SMTPwrapper_H #define SMTPwrapper_H -#include <qpe/applnk.h> +//#include <qpe/applnk.h> #include <qbitarray.h> #include <qdatetime.h> diff --git a/kmicromail/libmailwrapper/storemail.h b/kmicromail/libmailwrapper/storemail.h index 4433de0..e449f57 100644 --- a/kmicromail/libmailwrapper/storemail.h +++ b/kmicromail/libmailwrapper/storemail.h @@ -1,7 +1,7 @@ #ifndef __STORE_MAIL_H #define __STORE_MAIL_H -#include <qpe/applnk.h> +//#include <qpe/applnk.h> #include "generatemail.h" |