rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-default_applets.patch, NONE, 1.1 kdebase-workspace.spec, 1.117, 1.118

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6488

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.2-default_applets.patch 
Log Message:
* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
- omit battery applet from default panel


kdebase-workspace-4.1.2-default_applets.patch:

--- NEW FILE kdebase-workspace-4.1.2-default_applets.patch ---
diff -up kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp.default_applets kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp
--- kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp.default_applets	2008-07-08 04:26:33.000000000 -0500
+++ kdebase-workspace-4.1.2/plasma/plasma/desktopcorona.cpp	2008-11-07 07:38:00.000000000 -0600
@@ -161,6 +161,8 @@ void DesktopCorona::loadDefaultLayout()
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
+/* Omit battery applet, we already have guidance-power-manager -- Rex */
+/*
     Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
     Plasma::DataEngine *power = engines->loadEngine("powermanagement");
     if (power) {
@@ -170,6 +172,7 @@ void DesktopCorona::loadDefaultLayout()
         }
     }
     engines->unloadEngine("powermanagement");
+*/
 
     loadDefaultApplet("digital-clock", panel);
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdebase-workspace.spec	6 Nov 2008 11:23:25 -0000	1.117
+++ kdebase-workspace.spec	7 Nov 2008 14:10:33 -0000	1.118
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -29,6 +29,8 @@
 Patch13: kdebase-workspace-4.1.2-session-button.patch
 Patch14: kdebase-workspace-4.1.2-ldap.patch
 Patch15: kdebase-workspace-4.1.2-kdm-i18n.patch
+# omit battery applet from default panel
+Patch16: kdebase-workspace-4.1.2-default_applets.patch
 
 # upstream patches:
 # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -208,6 +210,7 @@
 %patch13 -p1 -b .session-button
 %patch14 -p1 -b .ldap
 %patch15 -p1 -b .kdm-i18n
+%patch16 -p1 -b .default_applets
 
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
@@ -356,6 +359,9 @@
 
 
 %changelog
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
+- omit battery applet from default panel
+
 * Thu Nov 06 2008 Than Ngo <than at redhat.com  4.1.3-2
 - fix i18n issue in kdm
 - add workaround for ldap issue