author | zautrix <zautrix> | 2005-01-29 05:45:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-29 05:45:29 (UTC) |
commit | 0850ade22908615389800c6ee973f5906154d980 (patch) (unidiff) | |
tree | f15401c42b2b4e86662f478c7e148c8de1a04b2b /microkde | |
parent | a710cbadcbce154dff51445e756f8e3fc77278f9 (diff) | |
download | kdepimpi-0850ade22908615389800c6ee973f5906154d980.zip kdepimpi-0850ade22908615389800c6ee973f5906154d980.tar.gz kdepimpi-0850ade22908615389800c6ee973f5906154d980.tar.bz2 |
desktop fix
-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 | |||
@@ -1278,17 +1278,29 @@ void KStandardDirs::addKDEDefaults() | |||
1278 | #else | 1278 | #else |
1279 | if (localKdeDir.at(localKdeDir.length()-1) != '/') | 1279 | if (localKdeDir.at(localKdeDir.length()-1) != '/') |
1280 | localKdeDir += '/'; | 1280 | localKdeDir += '/'; |
1281 | #endif | 1281 | #endif |
1282 | //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); | 1282 | //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 ); |
1283 | } | 1283 | } |
1284 | else | 1284 | else |
1285 | { | 1285 | { |
1286 | KConfig cfg ( QDir::homeDirPath() + "/.microkdehome" ); | 1286 | QString confFile; |
1287 | #ifdef DESKTOP_VERSION | ||
1288 | confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; | ||
1289 | QFileInfo fi ( confFile ); | ||
1290 | if ( !fi.exists() ) | ||
1291 | confFile = QDir::homeDirPath() + "/.microkdehome"; | ||
1292 | else | ||
1293 | qDebug("Loading path info from " + confFile ); | ||
1294 | |||
1295 | #else | ||
1296 | confFile = QDir::homeDirPath() + "/.microkdehome"; | ||
1297 | #endif | ||
1298 | KConfig cfg ( confFile ); | ||
1287 | cfg.setGroup("Global"); | 1299 | cfg.setGroup("Global"); |
1288 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); | 1300 | localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" ); |
1289 | } | 1301 | } |
1290 | } | 1302 | } |
1291 | else | 1303 | else |
1292 | { | 1304 | { |
1293 | // We treat root different to prevent root messing up the | 1305 | // We treat root different to prevent root messing up the |
1294 | // file permissions in the users home directory. | 1306 | // file permissions in the users home directory. |