[maemo-commits] [maemo-commits] r18137 - in projects/haf/trunk/libmatchbox2: . matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-04-22 15:33:41 +0300 (Wed, 22 Apr 2009)
New Revision: 18137

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:
	  mb_wm_comp_mgr_clutter_handle_damage():
	    Handle the damage even if we don't want to repair.
	    If we fail to do so and we do get a damage while
	    updating is disabled (like in effects) then we won't
	    get damages anymore at all.  May fix some X errors
	    around XDamageDestroy() as well.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-22 12:10:19 UTC (rev 18136)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-22 12:33:41 UTC (rev 18137)
@@ -1,3 +1,13 @@
+2009-04-22  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c:
+	  mb_wm_comp_mgr_clutter_handle_damage():
+	    Handle the damage even if we don't want to repair.
+	    If we fail to do so and we do get a damage while
+	    updating is disabled (like in effects) then we won't
+	    get damages anymore at all.  May fix some X errors
+	    around XDamageDestroy() as well.
+
 2009-04-22  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.34

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-04-22 12:10:19 UTC (rev 18136)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-04-22 12:33:41 UTC (rev 18137)
@@ -811,7 +811,10 @@
 
       if (!cclient->priv->actor ||
 	  (cclient->priv->flags & MBWMCompMgrClutterClientDontUpdate))
-	return False;
+        {
+          XDamageSubtract (wm->xdpy, cclient->priv->window_damage, None, None);
+          return False;
+        }
 
       MBWM_NOTE (COMPOSITOR,
 		 "Repairing window %lx, geometry %d,%d;%dx%d; more %d\n",