From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 03:46:01 +0000
Subject: 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
---
 kdecore/kstandarddirs.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'kdecore/kstandarddirs.cpp')

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
-- 
cgit v1.2.1