rev 14039 - in trunk/packages/kdebase-workspace/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2009-03-11 12:08:50 +0000 (Wed, 11 Mar 2009)
New Revision: 14039

Added:
   trunk/packages/kdebase-workspace/debian/patches/00_4.2.1_real.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
Bring kdebase-workspace up-to-date with real 4.2.1 release
(patch 00_4.2.1_real.diff) (Closes: #519247).

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-03-11 11:56:50 UTC (rev 14038)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-03-11 12:08:50 UTC (rev 14039)
@@ -4,8 +4,10 @@
 
   * Backport a patch to fix a nasty crash on plasma startup
     (patch 00_r934863_plasma_geometry_crash.diff).
+  * Bring kdebase-workspace up-to-date with real 4.2.1 release
+    (patch 00_4.2.1_real.diff) (Closes: #519247).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Mar 2009 13:45:01 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Mar 2009 14:06:44 +0200
 
 kdebase-workspace (4:4.2.1-1) experimental; urgency=low
 

Added: trunk/packages/kdebase-workspace/debian/patches/00_4.2.1_real.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/00_4.2.1_real.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/00_4.2.1_real.diff	2009-03-11 12:08:50 UTC (rev 14039)
@@ -0,0 +1,42 @@
+--- a/kwin/effects/presentwindows.cpp
++++ b/kwin/effects/presentwindows.cpp
+@@ -261,20 +261,20 @@
+ 
+ void PresentWindowsEffect::windowClosed( EffectWindow *w )
+     {
+-    if( !m_activated )
+-        return;
+     if( m_highlightedWindow == w )
+         setHighlightedWindow( findFirstWindow() );
++    if( !m_activated )
++        return;
+     m_windowData[w].visible = false; // TODO: Fix this so they do actually fade out
+-    rearrangeWindows();
+     }
+ 
+ void PresentWindowsEffect::windowDeleted( EffectWindow *w )
+     {
+-    if( !m_activated )
++    if( !m_windowData.contains( w ))
+         return;
+     m_windowData.remove( w );
+     m_motionManager.unmanage( w );
++    rearrangeWindows();
+     }
+ 
+ bool PresentWindowsEffect::borderActivated( ElectricBorder border )
+@@ -1101,11 +1101,14 @@
+     if( m_activated )
+         {
+         m_decalOpacity = 0.0;
++        m_highlightedWindow = NULL;
+         m_windowFilter.clear();
+ 
+         // Add every single window to m_windowData (Just calling [w] creates it)
+         foreach( EffectWindow *w, effects->stackingOrder() )
+             {
++            if( m_windowData.contains( w )) // Happens if we reactivate before the ending animation finishes
++                continue;
+             m_windowData[w].visible = isVisibleWindow( w );
+             m_windowData[w].opacity = 0.0;
+             if( w->isOnCurrentDesktop() && !w->isMinimized() )

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2009-03-11 11:56:50 UTC (rev 14038)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2009-03-11 12:08:50 UTC (rev 14039)
@@ -1,3 +1,4 @@
+00_4.2.1_real.diff
 00_r934863_plasma_geometry_crash.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff