rpms/kdebase-workspace/devel kdebase-workspace-4.1.0-kde#152914.patch, NONE, 1.1 kdebase-workspace.spec, 1.117, 1.118

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.0-kde#152914.patch 
Log Message:
* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-6
- patch to help krandr issues/crashes (kde#152914)


kdebase-workspace-4.1.0-kde#152914.patch:

--- NEW FILE kdebase-workspace-4.1.0-kde#152914.patch ---
--- trunk/KDE/kdebase/workspace/kwin/composite.cpp	2008/07/24 13:00:06	837331
+++ trunk/KDE/kdebase/workspace/kwin/composite.cpp	2008/07/28 11:49:43	838646
@@ -253,6 +253,9 @@
         }
     delete popup; // force re-creation of the Alt+F3 popup (opacity option)
     popup = NULL;
+    // discard all Deleted windows (#152914)
+    while( !deleted.isEmpty())
+        deleted.first()->discard( Allowed );
 #endif
     }
 
--- trunk/KDE/kdebase/workspace/kwin/deleted.cpp	2008/05/20 22:01:49	810520
+++ trunk/KDE/kdebase/workspace/kwin/deleted.cpp	2008/07/28 11:49:43	838646
@@ -48,6 +48,13 @@
     return d;
     }
 
+// to be used only from Workspace::finishCompositing()
+void Deleted::discard( allowed_t )
+    {
+    delete_refcount = 0;
+    delete this;
+    }
+
 void Deleted::copyToDeleted( Toplevel* c )
     {
     assert( dynamic_cast< Deleted* >( c ) == NULL );
--- trunk/KDE/kdebase/workspace/kwin/deleted.h	2007/11/27 19:40:25	742302
+++ trunk/KDE/kdebase/workspace/kwin/deleted.h	2008/07/28 11:49:43	838646
@@ -35,6 +35,7 @@
         // used by effects to keep the window around for e.g. fadeout effects when it's destroyed
         void refWindow();
         void unrefWindow( bool delay = false );
+        void discard( allowed_t );
         virtual int desktop() const;
         virtual QPoint clientPos() const;
         virtual QSize clientSize() const;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- kdebase-workspace.spec	1 Aug 2008 15:32:02 -0000	1.117
+++ kdebase-workspace.spec	1 Aug 2008 16:30:28 -0000	1.118
@@ -4,7 +4,7 @@
 Name: kdebase-workspace
 Version: 4.1.0
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -33,6 +33,8 @@
 # 833386, 833479:833545, 833581, 833587:833620, 834652, 836698, 837733, 837827.
 # This is backwards BC wrt 4.1, but the API of the new classes is not finalized.
 Patch100: kdebase-workspace-4.1.0-plasma-tooltips.patch
+# http://bugs.kde.org/152914
+Patch101: kdebase-workspace-4.1.0-kde#152914.patch
 
 # plasma-4.0-openSUSE patches:
 Patch204: kdebase-workspace-4.0.98-kickoff-suspend.patch
@@ -166,6 +168,7 @@
 
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
+%patch101 -p4 -b .kde#152914
 
 # plasma-4.0-openSUSE patches:
 %patch204 -p1 -b .kickoff-suspend
@@ -306,6 +309,9 @@
 
 
 %changelog
+* Fri Aug 01 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-6
+- patch to help krandr issues/crashes (kde#152914)
+
 * Fri Aug  1 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.0-5
 - fix 457479: "Run as root" dialog of kdm system settings is shown twice
   (due to activated signal being connected to twice)