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

[Olivier Fourdan]

Author: olivier
Date: 2006-12-19 21:54:02 +0000 (Tue, 19 Dec 2006)
New Revision: 24142

Modified:
   xfwm4/trunk/src/client.c
   xfwm4/trunk/src/compositor.c
Log:
Fix redraw problem with compositor

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2006-12-19 21:37:16 UTC (rev 24141)
+++ xfwm4/trunk/src/client.c	2006-12-19 21:54:02 UTC (rev 24142)
@@ -1566,7 +1566,7 @@
     g_return_val_if_fail (c, FALSE);
 
     clientUpdateIconPix (c);
-    frameDraw (c, TRUE);
+    frameDraw (c, FALSE);
     c->icon_timeout_id = 0;
 
     return FALSE;

Modified: xfwm4/trunk/src/compositor.c
===================================================================
--- xfwm4/trunk/src/compositor.c	2006-12-19 21:37:16 UTC (rev 24141)
+++ xfwm4/trunk/src/compositor.c	2006-12-19 21:54:02 UTC (rev 24142)
@@ -2040,7 +2040,7 @@
         cw->extents = None;
     }
 
-    if ((cw->attr.width != width) || (cw->attr.height != height))
+    if ((cw->attr.width != width) || (cw->attr.height != height) || shape_notify)
     {
 #if HAVE_NAME_WINDOW_PIXMAP
         if (cw->name_window_pixmap)
@@ -2049,10 +2049,6 @@
             cw->name_window_pixmap = None;
         }
 #endif
-    }
-
-    if ((cw->attr.width != width) || (cw->attr.height != height) || shape_notify)
-    {
         if (cw->picture)
         {
             XRenderFreePicture (display_info->dpy, cw->picture);