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

don't both with checking if it's a new group unless we have a package

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1071441
This commit is contained in:
Aaron J. Seigo 2010-01-08 02:13:52 +00:00
parent c856db301c
commit e52aebe20e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applet.cpp
View File

@ -2741,7 +2741,7 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
containmentConfig = KConfigGroup(KGlobal::config(), "Containments");
}
if (!containmentConfig.hasGroup(QString::number(appletId))) {
if (package && !containmentConfig.hasGroup(QString::number(appletId))) {
newGroup = true;
}
@ -2765,14 +2765,14 @@ KConfigGroup *AppletPrivate::mainConfigGroup()
appletConfig = KConfigGroup(KGlobal::config(), "Applets");
}
if (!appletConfig.hasGroup(QString::number(appletId))) {
if (package && !appletConfig.hasGroup(QString::number(appletId))) {
newGroup = true;
}
mainConfig = new KConfigGroup(&appletConfig, QString::number(appletId));
}
if (newGroup && package) {
if (newGroup) {
//see if we have a default configuration in our package
const QString defaultConfigFile = q->package()->filePath("defaultconfig");
if (!defaultConfigFile.isEmpty()) {