rev 5197 - in trunk/packages/kdebase/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2006-12-29 19:19:47 +0100 (Fri, 29 Dec 2006)
New Revision: 5197

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/patches/36_kwin.diff
Log:
Fix for #404226 (the bug introduced by original 36_kwin.diff). I've fixed the patch itself.
High urgency due to RC bugfix and etch artwork.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-12-29 16:42:28 UTC (rev 5196)
+++ trunk/packages/kdebase/debian/changelog	2006-12-29 18:19:47 UTC (rev 5197)
@@ -1,11 +1,15 @@
-kdebase (4:3.5.5a.dfsg.1-5) UNRELEASED; urgency=low
+kdebase (4:3.5.5a.dfsg.1-5) unstable; urgency=high
 
   +++ Changes by Sune Vuorela:
-  * Add | kfreebsd-gnu | hurd as dependencies to help installability on 
+  * Add | kfreebsd-gnu | hurd as dependencies to help installability on
     non-linux archs (Closes: 399059)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 21 Dec 2006 19:26:42 +0100
+  +++ Changes by Modestas Vainius:
+  * Fix 36_kwin.diff patch. In some cases clients were not properly added to
+    the group. (Closes: #404226)
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 29 Dec 2006 19:15:23 +0200
+
 kdebase (4:3.5.5a.dfsg.1-4) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: trunk/packages/kdebase/debian/patches/36_kwin.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/36_kwin.diff	2006-12-29 16:42:28 UTC (rev 5196)
+++ trunk/packages/kdebase/debian/patches/36_kwin.diff	2006-12-29 18:19:47 UTC (rev 5197)
@@ -1,5 +1,6 @@
---- kdebase-3.5.5a.dfsg.1/kwin/group.cpp	2006-10-01 19:32:07.000000000 +0200
-+++ kwin/group.cpp	2006-12-20 10:56:48.000000000 +0100
+diff -u kwin/group.cpp kwin/group.cpp
+--- kwin/group.cpp	2006-12-20 10:56:48.000000000 +0100
++++ kwin/group.cpp	2006-12-29 18:25:29.000000000 +0200
 @@ -761,6 +761,7 @@
  void Client::checkGroup( Group* set_group, bool force )
      {
@@ -8,7 +9,7 @@
      if( set_group != NULL )
          {
          if( set_group != in_group )
-@@ -817,13 +818,17 @@
+@@ -817,16 +818,21 @@
                  in_group->addMember( this );
                  }
              }
@@ -25,11 +26,18 @@
                  in_group->removeMember( this );            
                  in_group = NULL;
                  }
-+            in_group = new_group;
-             if( in_group == NULL )
-                 {
-                 in_group = new Group( None, workspace());
-@@ -843,35 +848,25 @@
+-            if( in_group == NULL )
+-                {
+-                in_group = new Group( None, workspace());
++            if( new_group == NULL )
++                new_group = new Group( None, workspace() );
++            if( in_group != new_group )
++	         {
++                in_group = new_group;
+                 in_group->addMember( this );
+                 }
+             }
+@@ -843,35 +849,25 @@
                  ++it;
              }
          if( groupTransient())