| author | ulf69 <ulf69> | 2004-11-07 01:13:59 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-11-07 01:13:59 (UTC) |
| commit | c3168210fffc83fbab58f44ce456fd241d44716d (patch) (side-by-side diff) | |
| tree | c93de33dd16e9b0f1e0752d6006aa75bd003fccf /libkdepim | |
| parent | 023e0e82dd8bf6421d12492a2dd25534fc43ad31 (diff) | |
| download | kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.zip kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.tar.gz kdepimpi-c3168210fffc83fbab58f44ce456fd241d44716d.tar.bz2 | |
added support for mailit opie mailer,
now we check for applications in QTDIR, QPEDIR and OPIEDIR
| -rw-r--r-- | libkdepim/externalapphandler.cpp | 17 | ||||
| -rw-r--r-- | libkdepim/kpimglobalprefs.h | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9f12152..3079141 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -413,8 +413,16 @@ void ExternalAppHandler::loadConfig() QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); + QString qtpath = QString::fromLatin1( getenv("QTDIR") ); + //if qtopiapath is not set, fallback to qt + if (qtopiapath.isEmpty()) + qtopiapath = qtpath; + + //if opiepath is not set, fallback to qtopia if (opiepath.isEmpty()) opiepath = qtopiapath; + + //mailclients QString mailmsg1 = "writeMail(QString,QString)"; @@ -427,8 +435,10 @@ void ExternalAppHandler::loadConfig() if (( QFile::exists( qtopiapath + "/bin/ompi" )) || - ( QFile::exists( opiepath + "/bin/ompi" ))) + ( QFile::exists( opiepath + "/bin/ompi" )) || + ( QFile::exists( qtpath + "/bin/ompi" ))) addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC, "OM/Pi email client", "QPE/Application/ompi", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); - if ( QFile::exists( qtopiapath + "/bin/qtmail" )) + if (( QFile::exists( qtopiapath + "/bin/qtmail" )) || + ( QFile::exists( qtpath + "/bin/qtmail" ))) addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); @@ -436,4 +446,7 @@ void ExternalAppHandler::loadConfig() addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC, "Opie email client", "QPE/Application/opiemail", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); + if ( QFile::exists( opiepath + "/bin/mailit" )) + addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_MAILIT_EMC, "Opie mailit email client", "QPE/Application/mailit", mailmsg1, "%1;%2", mailmsg2, "TO=%1;ATTACHMENT=%2"); + diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 11c534a..5e27e85 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h @@ -51,5 +51,6 @@ class KPimGlobalPrefs : public KPrefs OMPI_EMC = 2, QTOPIA_EMC = 3, - OPIE_EMC = 4 + OPIE_EMC = 4, + OPIE_MAILIT_EMC = 5 }; |