rpms/kdebase-workspace/devel kdebase-workspace-4.3.0-default_applets.patch, NONE, 1.1 kdebase-workspace.spec, 1.269, 1.270 kdebase-workspace-4.2.95-default-applets.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv314

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-default_applets.patch 
Removed Files:
	kdebase-workspace-4.2.95-default-applets.patch 
Log Message:
rebase default applets patch


kdebase-workspace-4.3.0-default_applets.patch:
 desktopcorona.cpp |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.3.0-default_applets.patch ---
diff -up kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp.default-applets	2009-06-17 15:07:42.000000000 -0500
+++ kdebase-workspace-4.3.0/plasma/shells/desktop/desktopcorona.cpp	2009-08-19 18:18:03.571937055 -0500
@@ -259,15 +259,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);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -p -r1.269 -r1.270
--- kdebase-workspace.spec	19 Aug 2009 16:00:43 -0000	1.269
+++ kdebase-workspace.spec	19 Aug 2009 23:20:21 -0000	1.270
@@ -21,7 +21,7 @@ Patch8: kdebase-workspace-4.2.85-klipper
 # 434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.95-default-applets.patch
+Patch12: kdebase-workspace-4.3.0-default_applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
@@ -227,7 +227,7 @@ Requires: akonadi
 %patch8 -p1 -b .klipper-url
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default-applets
+%patch12 -p1 -b .default_applets
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo


--- kdebase-workspace-4.2.95-default-applets.patch DELETED ---