kaddressbook: make it look into proper locations

1 files changed, 8 insertions, 1 deletions

diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index e373105..72383fd 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -24,6 +24,7 @@ void dumpMissing();
 int main( int argc, char **argv )
 {
     if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
+    if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi");
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
@@ -67,9 +68,15 @@ int main( int argc, char **argv )
         KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
 #else
       QString fileName ;
-      fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
+      const char *kpd = ::getenv("KDEPIMPIDIR");
+      if(kpd)
+          fileName = QString(kpd) + "/kaddressbook/icons22/";
+      else
+          fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
       QApplication::addLibraryPath ( qApp->applicationDirPath () );
+      if(kpd) KGlobal::dirs()->addResourceDir( "lib", QString(kpd)+"/kaddressbook/" );
+      KGlobal::dirs()->addResourceDir( "lib", "/usr/lib/" );
 
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));