-rw-r--r-- | microkde/kdecore/kstandarddirs.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp index cf0d1ee..810c889 100644 --- a/microkde/kdecore/kstandarddirs.cpp +++ b/microkde/kdecore/kstandarddirs.cpp | |||
@@ -1295,12 +1295,22 @@ void KStandardDirs::addKDEDefaults() | |||
1295 | #else | 1295 | #else |
1296 | confFile = QDir::homeDirPath() + "/.microkdehome"; | 1296 | confFile = QDir::homeDirPath() + "/.microkdehome"; |
1297 | #endif | 1297 | #endif |
1298 | KConfig cfg ( confFile ); | 1298 | KConfig cfg ( confFile ); |
1299 | cfg.setGroup("Global"); | 1299 | cfg.setGroup("Global"); |
1300 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); | 1300 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); |
1301 | #ifdef DESKTOP_VERSION | ||
1302 | if ( localKdeDir.startsWith( "LOCAL:" ) ) { | ||
1303 | #ifdef _WIN32_ | ||
1304 | localKdeDir = qApp->applicationDirPath () + "\\"+ localKdeDir.mid( 6 ); | ||
1305 | #else | ||
1306 | localKdeDir = qApp->applicationDirPath () + "/"+ localKdeDir.mid( 6 ); | ||
1307 | #endif | ||
1308 | qDebug("Using local conf dir %s ",localKdeDir.latin1() ); | ||
1309 | } | ||
1310 | #endif | ||
1301 | } | 1311 | } |
1302 | } | 1312 | } |
1303 | else | 1313 | else |
1304 | { | 1314 | { |
1305 | // We treat root different to prevent root messing up the | 1315 | // We treat root different to prevent root messing up the |
1306 | // file permissions in the users home directory. | 1316 | // file permissions in the users home directory. |