rpms/kdebase-workspace/devel kdebase-workspace-4.2.0-kde#180576.patch, 1.2, 1.3 kdebase-workspace.spec, 1.193, 1.194

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-kde#180576.patch 
Log Message:
Readd kde#180576 patch, still not backported.

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

Index: kdebase-workspace-4.2.0-kde#180576.patch
===================================================================
RCS file: kdebase-workspace-4.2.0-kde#180576.patch
diff -N kdebase-workspace-4.2.0-kde#180576.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.2.0-kde#180576.patch	27 Feb 2009 15:24:06 -0000	1.3
@@ -0,0 +1,12 @@
+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/devel/kdebase-workspace.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- kdebase-workspace.spec	27 Feb 2009 13:59:44 -0000	1.193
+++ kdebase-workspace.spec	27 Feb 2009 15:24:06 -0000	1.194
@@ -40,6 +40,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
+# from 4.3: http://bugs.kde.org/180576
+Patch103: kdebase-workspace-4.2.0-kde#180576.patch
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
@@ -219,6 +221,7 @@
 %else
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
+%patch103 -p1 -b .kde#180576
 
 %build