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

prevent multiple inclusions of the same theme and infinite cycles due to cascading fallbacks

Browse Source 
svn path=/branches/KDE/4.3/kdelibs/; revision=987552
This commit is contained in:
Aaron J. Seigo 2009-06-26 10:22:20 +00:00
parent 115e507adb
commit 153934b66d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
theme.cpp
View File

@ -407,17 +407,24 @@ void ThemePrivate::setThemeName(const QString &tempThemeName, bool writeSettings
QString fallback = cg.readEntry("FallbackTheme", QString()); QString fallback = cg.readEntry("FallbackTheme", QString());
fallbackThemes.clear(); fallbackThemes.clear();
while (!fallback.isEmpty()) { while (!fallback.isEmpty() && !fallbackThemes.contains(fallback)) {
fallbackThemes.append(fallback); fallbackThemes.append(fallback);
QString metadataPath(KStandardDirs::locate("data", "desktoptheme/" + theme + "/metadata.desktop")); QString metadataPath(KStandardDirs::locate("data", "desktoptheme/" + theme + "/metadata.desktop"));
KConfig metadata(metadataPath); KConfig metadata(metadataPath);
cg = KConfigGroup(&metadata, "Settings"); cg = KConfigGroup(&metadata, "Settings");
fallback = cg.readEntry("FallbackTheme", QString()); fallback = cg.readEntry("FallbackTheme", QString());
//TODO: grab the fallback's wallpaper defaults? //TODO: grab the fallback's wallpaper defaults?
} }
fallbackThemes.append("oxygen");
fallbackThemes.append(ThemePrivate::defaultTheme); if (!fallbackThemes.contains("oxygen")) {
fallbackThemes.append("oxygen");
}
if (!fallbackThemes.contains(ThemePrivate::defaultTheme)) {
fallbackThemes.append(ThemePrivate::defaultTheme);
}
QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), QObject::disconnect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()),
q, SLOT(colorsChanged())); q, SLOT(colorsChanged()));