diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 03:46:01 +0000 |
| commit | 865f314dd5ed55508f45a32973b709b79a541e36 (patch) | |
| tree | dc1a3a884bb2fc10a89a3c46313897d22c5771eb /kdecore/kstandarddirs.cpp | |
| parent | ce4a32fe52ef09d8f5ff1dd22c001110902b60a2 (diff) | |
| download | tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.tar.gz tdelibs-865f314dd5ed55508f45a32973b709b79a541e36.zip | |
kdelibs update to Trinity v3.5.11
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kstandarddirs.cpp')
| -rw-r--r-- | kdecore/kstandarddirs.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp index 015590c2d..28568b74e 100644 --- a/kdecore/kstandarddirs.cpp +++ b/kdecore/kstandarddirs.cpp @@ -834,6 +834,10 @@ QStringList KStandardDirs::resourceDirs(const char *type) const if ((local || testdir.exists()) && !candidates->contains(path)) candidates->append(path); } + // UGLY HACK - Chris CHeney + if (local && (!strcmp("config", type))) + candidates->append("/etc/kde3/"); + // local = false; } } @@ -1021,7 +1025,7 @@ QString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "data")) return "share/apps/"; if (!strcmp(type, "html")) - return "share/doc/HTML/"; + return "share/doc/kde/HTML/"; if (!strcmp(type, "icon")) return "share/icons/"; if (!strcmp(type, "config")) @@ -1041,7 +1045,7 @@ QString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "mime")) return "share/mimelnk/"; if (!strcmp(type, "cgi")) - return "cgi-bin/"; + return "lib/cgi-bin/"; if (!strcmp(type, "wallpaper")) return "share/wallpapers/"; if (!strcmp(type, "templates")) @@ -1315,7 +1319,7 @@ void KStandardDirs::addKDEDefaults() } else { - localKdeDir = QDir::homeDirPath() + "/.kde/"; + localKdeDir = QDir::homeDirPath() + "/.kde3/"; } if (localKdeDir != "-/") @@ -1425,6 +1429,8 @@ void KStandardDirs::addKDEDefaults() } addResourceDir("home", QDir::homeDirPath()); + + addResourceDir("locale", "/usr/share/locale-langpack/", true); } void KStandardDirs::checkConfig() const |