rpms/kdebase-workspace/devel kdebase-workspace-4.2.95-default-applets.patch, NONE, 1.1 kdebase-workspace.spec, 1.245, 1.246 kdebase-workspace-4.2.0-default_applets.patch, 1.2, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.95-default-applets.patch 
Removed Files:
	kdebase-workspace-4.2.0-default_applets.patch 
Log Message:
* Thu Jul 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
- add kde-plasma-networkmanagement to the default panel if installed

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

--- NEW FILE kdebase-workspace-4.2.95-default-applets.patch ---
diff -ur kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp	2009-07-03 01:07:27.000000000 +0200
@@ -259,15 +259,22 @@
     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");
+    }
+
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+       loadDefaultApplet("networkmanagement", panel);
     }
-    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.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdebase-workspace.spec	2 Jul 2009 02:24:35 -0000	1.245
+++ kdebase-workspace.spec	2 Jul 2009 23:11:06 -0000	1.246
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.95
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -23,7 +23,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.0-default_applets.patch
+Patch12: kdebase-workspace-4.2.95-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
@@ -516,7 +516,10 @@ fi
 
 
 %changelog
-* Wed Jul  1 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.95-5
+* Thu Jul 02 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
+- add kde-plasma-networkmanagement to the default panel if installed
+
+* Wed Jul 01 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.95-5
 - rebuild (google-gadgets)
 
 * Wed Jul 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-4


--- kdebase-workspace-4.2.0-default_applets.patch DELETED ---