rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-kde#180576.patch, NONE, 1.1 kdebase-workspace.spec, 1.129, 1.130

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-kde#180576.patch 
Log Message:
* Mon Feb 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-8
- kickoff logout shuts down system (#484737, kdebug#180576)


kdebase-workspace-4.2.0-kde#180576.patch:

--- NEW FILE kdebase-workspace-4.2.0-kde#180576.patch ---
diff -up kdebase-workspace-4.2.0/libs/kworkspace/kdisplaymanager.cpp.kde#180576 kdebase-workspace-4.2.0/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.2.0/libs/kworkspace/kdisplaymanager.cpp.kde#180576	2009-02-09 13:25:39.000000000 -0600
+++ kdebase-workspace-4.2.0/libs/kworkspace/kdisplaymanager.cpp	2009-02-09 13:27:30.000000000 -0600
@@ -218,7 +218,7 @@ KDisplayManager::shutdown( KWorkSpace::S
               KWorkSpace::ShutdownMode shutdownMode, /* NOT Default */
               const QString &bootOption )
 {
-	if (shutdownType == KWorkSpace::ShutdownTypeNone)
+	if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
 		return;
 
 	if (DMType == NoDM) {


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdebase-workspace.spec	8 Feb 2009 19:58:02 -0000	1.129
+++ kdebase-workspace.spec	9 Feb 2009 19:46:41 -0000	1.130
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 7%{?dist}
+Release: 8%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -37,6 +37,8 @@
 # revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
 # 0.3 requires BlueZ 4 and the patch above
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
+# http://bugs.kde.org/180576
+Patch103:  kdebase-workspace-4.2.0-kde#180576.patch
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
@@ -202,6 +204,8 @@
 %else
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
+%patch103 -p1 -b .kde#180576
+
 
 %build
 
@@ -327,6 +331,9 @@
 
 
 %changelog
+* Mon Feb 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-8
+- kickoff logout shuts down system (#484737, kdebug#180576)
+
 * Sun Feb 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-7
 - include awol rss dataengine, BR: kdepimlibs-devel (see also kdebug#179050)