| -rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index f3584d7..cf0d1ee 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp @@ -1274,25 +1274,37 @@ void KStandardDirs::addKDEDefaults() { #ifdef _WIN32_ if (localKdeDir.at(localKdeDir.length()-1) != '\\') localKdeDir += '\\'; #else if (localKdeDir.at(localKdeDir.length()-1) != '/') localKdeDir += '/'; #endif //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); } else { - KConfig cfg ( QDir::homeDirPath() + "/.microkdehome" ); + QString confFile; +#ifdef DESKTOP_VERSION + confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; + QFileInfo fi ( confFile ); + if ( !fi.exists() ) + confFile = QDir::homeDirPath() + "/.microkdehome"; + else + qDebug("Loading path info from " + confFile ); + +#else + confFile = QDir::homeDirPath() + "/.microkdehome"; +#endif + KConfig cfg ( confFile ); cfg.setGroup("Global"); localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); } } else { // We treat root different to prevent root messing up the // file permissions in the users home directory. localKdeDir = readEnvPath("MICROKDEROOTHOME"); if (!localKdeDir.isEmpty()) { if (localKdeDir.at(localKdeDir.length()-1) != '/') |