[Xfce4-commits] r23292 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2006-10-05 21:24:37 +0000 (Thu, 05 Oct 2006)
New Revision: 23292

Modified:
   xfwm4/trunk/src/compositor.c
Log:
Improve unredirection vs. map/unmap

Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c	2006-10-05 20:02:00 UTC (rev 23291)
+++ xfwm4/trunk/src/compositor.c	2006-10-05 21:24:37 UTC (rev 23292)
@@ -1077,7 +1077,7 @@
         display_info = screen_info->display_info;
 
         free_win_data (cw, FALSE);
-        cw->ignore_unmaps = 0;
+        cw->ignore_unmaps = 1;
         cw->redirected = FALSE;
 
         XCompositeUnredirectWindow (display_info->dpy, cw->id, display_info->composite_mode);
@@ -1749,13 +1749,6 @@
     cw->viewable = TRUE;
     cw->damaged = FALSE;
 
-    if (cw->ignore_unmaps)
-    {
-        cw->ignore_unmaps++;
-        TRACE ("Mapped window 0x%lx had unmaps pending, increased to %i", cw->id, cw->ignore_unmaps);
-        return;
-    }
-
     screen_info = cw->screen_info;
     if (!WIN_IS_REDIRECTED(cw))
     {