[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/config
From:       Ambroz Bizjak <ambro () b4ever ! net>
Date:       2008-10-01 19:04:56
Message-ID: 1222887896.400797.1562.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866718 by abizjak:

Don't create path components of the local config path in 
changeFileName. They will be created by the config backend if
the config is saved. 
This prevents the creation of unneeded empty local directory trees
(e.g. $KDEHOME/share/kde4/...).
More importantly, it prevents "kbuildsycoca4 --global" from creating 
these directories in system locations (KDEHOME is invalid there so it
will use the first entry in KDEDIRS).


 M  +2 -2      kconfig.cpp  


--- trunk/KDE/kdelibs/kdecore/config/kconfig.cpp #866717:866718
@@ -409,7 +409,7 @@
                 fileName = appName + QLatin1String("rc");
                 if (type && *type)
                     resourceType = type; // only change it if it's not empty
-                file = KStandardDirs::locateLocal(resourceType, fileName, componentData);
+                file = KStandardDirs::locateLocal(resourceType, fileName, false, componentData);
             }
         } else if (wantGlobals()) { // accessing "kdeglobals"
             resourceType = "config";
@@ -421,7 +421,7 @@
     else {
         if (type && *type)
             resourceType = type; // only change it if it's not empty
-        file = KStandardDirs::locateLocal(resourceType, fileName, componentData);
+        file = KStandardDirs::locateLocal(resourceType, fileName, false, componentData);
 
         if (fileName == QLatin1String("kdeglobals"))
             openFlags |= KConfig::IncludeGlobals;
[prev in list] [next in list] [prev in thread] [next in thread]