diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.orig kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
diff -up kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp.default_applets 2009-01-06 11:22:28.000000000 -0600
+++ kdebase-workspace-4.2.0/plasma/shells/desktop/desktopcorona.cpp 2009-01-30 12:40:53.000000000 -0600
@@ -200,15 +200,18 @@ 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")) &&
+ (!QFile::exists("/usr/share/autostart/kpowersave-autostart.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);
emit containmentAdded(panel);