summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/kstandarddirs.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 500426b..7f2a326 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1218,49 +1218,60 @@ void KStandardDirs::addKDEDefaults()
1218{ 1218{
1219 //qDebug("ERROR: KStandardDirs::addKDEDefaults() called "); 1219 //qDebug("ERROR: KStandardDirs::addKDEDefaults() called ");
1220 //return; 1220 //return;
1221 QStringList kdedirList; 1221 QStringList kdedirList;
1222 1222
1223 // begin KDEDIRS 1223 // begin KDEDIRS
1224 QString kdedirs = readEnvPath("MICROKDEDIRS"); 1224 QString kdedirs = readEnvPath("MICROKDEDIRS");
1225 if (!kdedirs.isEmpty()) 1225 if (!kdedirs.isEmpty())
1226 { 1226 {
1227 tokenize(kdedirList, kdedirs, ":"); 1227 tokenize(kdedirList, kdedirs, ":");
1228 } 1228 }
1229 else 1229 else
1230 { 1230 {
1231 QString kdedir = readEnvPath("MICROKDEDIR"); 1231 QString kdedir = readEnvPath("MICROKDEDIR");
1232 if (!kdedir.isEmpty()) 1232 if (!kdedir.isEmpty())
1233 { 1233 {
1234 kdedir = KShell::tildeExpand(kdedir); 1234 kdedir = KShell::tildeExpand(kdedir);
1235 kdedirList.append(kdedir); 1235 kdedirList.append(kdedir);
1236 } 1236 }
1237 } 1237 }
1238//US kdedirList.append(KDEDIR); 1238//US kdedirList.append(KDEDIR);
1239//US for embedded, add qtopia dir as kdedir 1239//US for embedded, add qtopia dir as kdedir
1240 1240
1241#ifndef DESKTOP_VERSION 1241#ifndef DESKTOP_VERSION
1242 kdedirList.append(readEnvPath("QPEDIR" )); 1242 QString tmp = readEnvPath("QPEDIR");
1243 if (!tmp.isEmpty())
1244 kdedirList.append(tmp);
1245
1246 tmp = readEnvPath("QTDIR");
1247 if (!tmp.isEmpty())
1248 kdedirList.append(tmp);
1249
1250 tmp = readEnvPath("OPIEDIR");
1251 if (!tmp.isEmpty())
1252 kdedirList.append(tmp);
1253
1243#endif 1254#endif
1244 1255
1245#ifdef __KDE_EXECPREFIX 1256#ifdef __KDE_EXECPREFIX
1246 QString execPrefix(__KDE_EXECPREFIX); 1257 QString execPrefix(__KDE_EXECPREFIX);
1247 if (execPrefix!="NONE") 1258 if (execPrefix!="NONE")
1248 kdedirList.append(execPrefix); 1259 kdedirList.append(execPrefix);
1249#endif 1260#endif
1250 1261
1251 QString localKdeDir; 1262 QString localKdeDir;
1252 1263
1253//US if (getuid()) 1264//US if (getuid())
1254 if (true) 1265 if (true)
1255 { 1266 {
1256 localKdeDir = readEnvPath("MICROKDEHOME"); 1267 localKdeDir = readEnvPath("MICROKDEHOME");
1257 if (!localKdeDir.isEmpty()) 1268 if (!localKdeDir.isEmpty())
1258 { 1269 {
1259 if (localKdeDir.at(localKdeDir.length()-1) != '/') 1270 if (localKdeDir.at(localKdeDir.length()-1) != '/')
1260 localKdeDir += '/'; 1271 localKdeDir += '/';
1261 } 1272 }
1262 else 1273 else
1263 { 1274 {
1264 localKdeDir = QDir::homeDirPath() + "/kdepim/"; 1275 localKdeDir = QDir::homeDirPath() + "/kdepim/";
1265 } 1276 }
1266 } 1277 }