alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't include kdeglobals when dealing with a cache config

Browse Source 
The svg elements cache isn't really a "configuration" and it's not
something that should be overridden by global config settings.

Loading it as a simple config skips the cascading and saves reparsing
kdeglobals.

REVIEW: 128966
This commit is contained in:
David Edmundson 2016-09-21 07:11:28 +01:00
parent 16b478a827
commit 494c690b18
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plasma/private/theme_p.cpp
View File

@ -266,7 +266,7 @@ bool ThemePrivate::useCache()
} }
const QString svgElementsFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + '/' + svgElementsFileName; const QString svgElementsFile = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + '/' + svgElementsFileName;
svgElementsCache = KSharedConfig::openConfig(svgElementsFile); svgElementsCache = KSharedConfig::openConfig(svgElementsFile, KConfig::SimpleConfig);
QString currentIconThemePath; QString currentIconThemePath;
const auto *iconTheme = KIconLoader::global()->theme(); const auto *iconTheme = KIconLoader::global()->theme();
if (iconTheme) { if (iconTheme) {
@ -277,7 +277,7 @@ bool ThemePrivate::useCache()
if (oldIconThemePath != currentIconThemePath) { if (oldIconThemePath != currentIconThemePath) {
discardCache(PixmapCache | SvgElementsCache); discardCache(PixmapCache | SvgElementsCache);
globalGroup.writeEntry("currentIconThemePath", currentIconThemePath); globalGroup.writeEntry("currentIconThemePath", currentIconThemePath);
svgElementsCache = KSharedConfig::openConfig(svgElementsFile); svgElementsCache = KSharedConfig::openConfig(svgElementsFile, KConfig::SimpleConfig);
} }
} }