rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-default_applets.patch, 1.1, 1.2 kdebase-workspace.spec, 1.118, 1.119

[Than Ngo]

Author: than

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

Modified Files:
	kdebase-workspace-4.1.2-default_applets.patch 
	kdebase-workspace.spec 
Log Message:
only omit battery applet when guidance-power-manager is installed


kdebase-workspace-4.1.2-default_applets.patch:

Index: kdebase-workspace-4.1.2-default_applets.patch
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace-4.1.2-default_applets.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.1.2-default_applets.patch	7 Nov 2008 14:10:33 -0000	1.1
+++ kdebase-workspace-4.1.2-default_applets.patch	7 Nov 2008 14:50:22 -0000	1.2
@@ -1,20 +1,28 @@
-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()
+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);
  
-+/* 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()
+-    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");
-+*/
+-    engines->unloadEngine("powermanagement");
  
      loadDefaultApplet("digital-clock", panel);
  


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdebase-workspace.spec	7 Nov 2008 14:10:33 -0000	1.118
+++ kdebase-workspace.spec	7 Nov 2008 14:50:22 -0000	1.119
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -359,10 +359,13 @@
 
 
 %changelog
+* Fri Nov 07 2008 Than Ngo <than at redhat.com>  4.1.3-4
+- only omit battery applet when guidance-power-manager is installed
+
 * 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
+* Thu Nov 06 2008 Than Ngo <than at redhat.com> 4.1.3-2
 - fix i18n issue in kdm
 - add workaround for ldap issue