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

forcefully remove some entries

Browse Source 
newly created containments may have some default entries like plugin
or formfactor written in the config group, but not in keyList()
they have to be explicitly removed because wouldn't be removed in
deleteGroup
BUG:335792
This commit is contained in:
Marco Martin 2014-06-04 17:25:38 +02:00
parent 6608359333
commit b6ac8ded88
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plasma/private/applet_p.cpp
View File

@ -446,17 +446,26 @@ void AppletPrivate::resetConfigurationObject()
{
// make sure mainConfigGroup exists in all cases
mainConfigGroup();
mainConfig->deleteEntry("plugin");
mainConfig->deleteEntry("formfactor");
mainConfig->deleteEntry("immutability");
mainConfig->deleteEntry("location");
mainConfig->deleteGroup();
delete mainConfig;
mainConfig = 0;
if (!q->containment()) {
return;
}
Corona *corona = q->containment()->corona();
if (corona) {
corona->requireConfigSync();
Containment *cont = qobject_cast<Containment *>(q);
if (cont && cont->corona()) {
cont->corona()->requireConfigSync();
} else {
if (!q->containment()) {
return;
}
Corona *corona = q->containment()->corona();
if (corona) {
corona->requireConfigSync();
}
}
}