author | Michael Krelin <hacker@klever.net> | 2007-07-10 22:35:13 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-10 22:35:13 (UTC) |
commit | 1c5369f3785b118ff4d18c4940913b800dd201fb (patch) (unidiff) | |
tree | fa2927b679af83e9fe70f5333d05a88484dbb8bf /pwmanager | |
parent | de61d6005b51bc62f01786e06cd964e530c1bf83 (diff) | |
download | kdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.zip kdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.tar.gz kdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.tar.bz2 |
pwmanager: look in proper directoriesp2
-rw-r--r-- | pwmanager/pwmanager/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp index acb0011..a39d983 100644 --- a/pwmanager/pwmanager/main.cpp +++ b/pwmanager/pwmanager/main.cpp | |||
@@ -141,8 +141,9 @@ static void addAuthors(KAboutData *aboutData) | |||
141 | #endif | 141 | #endif |
142 | 142 | ||
143 | int main(int argc, char *argv[]) | 143 | int main(int argc, char *argv[]) |
144 | { | 144 | { |
145 | if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi"); | ||
145 | if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); | 146 | if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); |
146 | printDebugConfigureInfo(); | 147 | printDebugConfigureInfo(); |
147 | #ifndef PWM_EMBEDDED | 148 | #ifndef PWM_EMBEDDED |
148 | KAboutData aboutData(PACKAGE_NAME, PROG_NAME, | 149 | KAboutData aboutData(PACKAGE_NAME, PROG_NAME, |
@@ -188,9 +189,13 @@ int main(int argc, char *argv[]) | |||
188 | else | 189 | else |
189 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/"); | 190 | KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/"); |
190 | #else | 191 | #else |
191 | QString fileName ; | 192 | QString fileName ; |
192 | fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/"; | 193 | const char *kpd = ::getenv("KDEPIMPIDIR"); |
194 | if(kpd) | ||
195 | fileName = QString(kpd) + "/pwmanager/icons22/"; | ||
196 | else | ||
197 | fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/"; | ||
193 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 198 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
194 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); | 199 | QApplication::addLibraryPath ( qApp->applicationDirPath () ); |
195 | 200 | ||
196 | #endif | 201 | #endif |