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

Merge remote-tracking branch 'origin/KDE/4.8'

Browse Source 
Conflicts:
	solid/solid/backends/wmi/wmiquery.cpp
This commit is contained in:
David Faure 2012-05-09 11:25:37 +02:00
commit ba0e9ac947
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applet.cpp
View File

@ -268,7 +268,7 @@ void Applet::save(KConfigGroup &g) const
group = *d->mainConfigGroup();
}
//kDebug() << "saving to" << group.name();
//kDebug() << "saving" << pluginName() << "to" << group.name();
// we call the dptr member directly for locked since isImmutable()
// also checks kiosk and parent containers
group.writeEntry("immutability", (int)d->immutability);
@ -843,7 +843,7 @@ QString Applet::icon() const
QString Applet::pluginName() const
{
if (!d->appletDescription.isValid()) {
return QString();
return d->mainConfigGroup()->readEntry("plugin", QString());
}
return d->appletDescription.pluginName();

2
service.cpp
View File

@ -237,7 +237,7 @@ ServiceJob *Service::startOperationCall(const KConfigGroup &description, QObject
job = createJob(op, params);
}
} else {
kDebug() << "Not a valid group!"<<d->config->groupList();
kDebug() << op << "is not a valid group; valid groups are:" << d->config->groupList();
}
if (!job) {