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

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

Browse Source 
Conflicts:
	CMakeLists.txt
	kdeui/kernel/kglobalsettings.cpp
	kdeui/widgets/kmessagewidget.cpp
	nepomuk/core/nepomukmainmodel.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcewatcher.cpp
	solid/solid/backends/fstab/fstabstorageaccess.cpp
	solid/solid/backends/wmi/wmicdrom.cpp
	solid/solid/backends/wmi/wmidevice.cpp
	solid/solid/backends/wmi/wmimanager.cpp
	solid/solid/backends/wmi/wmistorage.cpp
	solid/solid/backends/wmi/wmistorageaccess.cpp
	solid/solid/backends/wmi/wmivolume.cpp
This commit is contained in:
Stephen Kelly 2012-05-06 23:19:58 +02:00
commit 4e581398e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applet.cpp
View File

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