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

if the Applet requests config() before being added to a containment, but is nested in another Applet, it should still use the nest-Applet's config.

Browse Source 
svn path=/branches/KDE/4.4/kdelibs/; revision=1071438
This commit is contained in:
Aaron J. Seigo 2010-01-08 02:03:55 +00:00
parent 5c1a69f05f
commit fb8898f328
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
applet.cpp
View File

@ -2749,17 +2749,16 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
} else { } else {
KConfigGroup appletConfig; KConfigGroup appletConfig;
if (Containment *c = q->containment()) { Containment *c = q->containment();
Plasma::Applet *parentApplet = qobject_cast<Applet *>(q->parent()); Applet *parentApplet = qobject_cast<Applet *>(q->parent());
if (parentApplet && parentApplet != static_cast<Applet *>(c)) { if (parentApplet && parentApplet != static_cast<Applet *>(c)) {
// this applet is nested inside another applet! use it's config // this applet is nested inside another applet! use it's config
// as the parent group in the config // as the parent group in the config
appletConfig = parentApplet->config(); appletConfig = parentApplet->config();
} else { appletConfig = KConfigGroup(&appletConfig, "Applets");
// applet directly in a Containment, as usual } else if (c) {
appletConfig = c->config(); // applet directly in a Containment, as usual
} appletConfig = c->config();
appletConfig = KConfigGroup(&appletConfig, "Applets"); appletConfig = KConfigGroup(&appletConfig, "Applets");
} else { } else {
kWarning() << "requesting config for" << q->name() << "without a containment!"; kWarning() << "requesting config for" << q->name() << "without a containment!";