summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-07-10 22:34:09 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-10 22:34:09 (UTC)
commit399974b248bf037ff8da6b91d74208acfcde779c (patch) (unidiff)
treedcee48dc9f11383b42534775e0fa10b6aab6adb6
parenta08aff328d4393031d5ba7d622c2b05705a89d73 (diff)
downloadkdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.zip
kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.gz
kdepimpi-399974b248bf037ff8da6b91d74208acfcde779c.tar.bz2
kaddressbook: make it look into proper locations
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/mainembedded.cpp9
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();
24int main( int argc, char **argv ) 24int main( int argc, char **argv )
25{ 25{
26 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); 26 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
27 if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi");
27#ifndef DESKTOP_VERSION 28#ifndef DESKTOP_VERSION
28 QPEApplication a( argc, argv ); 29 QPEApplication a( argc, argv );
29 a.setKeepRunning (); 30 a.setKeepRunning ();
@@ -67,9 +68,15 @@ int main( int argc, char **argv )
67 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); 68 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
68#else 69#else
69 QString fileName ; 70 QString fileName ;
70 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/"; 71 const char *kpd = ::getenv("KDEPIMPIDIR");
72 if(kpd)
73 fileName = QString(kpd) + "/kaddressbook/icons22/";
74 else
75 fileName = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
71 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 76 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
72 QApplication::addLibraryPath ( qApp->applicationDirPath () ); 77 QApplication::addLibraryPath ( qApp->applicationDirPath () );
78 if(kpd) KGlobal::dirs()->addResourceDir( "lib", QString(kpd)+"/kaddressbook/" );
79 KGlobal::dirs()->addResourceDir( "lib", "/usr/lib/" );
73 80
74#endif 81#endif
75 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); 82 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));