diff -up kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp.battery kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp
--- kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp.battery 2008-11-07 15:21:36.000000000 +0100
+++ kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp 2008-11-07 15:24:13.000000000 +0100
@@ -161,15 +161,17 @@ void DesktopCorona::loadDefaultLayout()
loadDefaultApplet("tasks", panel);
loadDefaultApplet("systemtray", panel);
- Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
- Plasma::DataEngine *power = engines->loadEngine("powermanagement");
- if (power) {
- const QStringList &batteries = power->query("Battery")["sources"].toStringList();
- if (!batteries.isEmpty()) {
- loadDefaultApplet("battery", panel);
+ if (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) {
+ Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+ Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+ if (power) {
+ const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+ if (!batteries.isEmpty()) {
+ loadDefaultApplet("battery", panel);
+ }
}
+ engines->unloadEngine("powermanagement");
}
- engines->unloadEngine("powermanagement");
loadDefaultApplet("digital-clock", panel);