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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-21 13:39:42 +0200 (Wed, 21 Jan 2009)
New Revision: 17238

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
always use bounding box for damage


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-20 16:29:57 UTC (rev 17237)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-21 11:39:42 UTC (rev 17238)
@@ -1,3 +1,9 @@
+2009-01-21  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_client_repair_real): Always use bounding box
+	since Clutter uses it as well.
+
 2009-01-19  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	Added documentation comments in Doxygen-friendly format.

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-01-20 16:29:57 UTC (rev 17237)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-01-21 11:39:42 UTC (rev 17238)
@@ -738,34 +738,8 @@
 					 &r_count,
 					 &r_bounds);
 
-  if (r_damage && r_count < 3)
+  if (r_damage)
     {
-      for (i = 0; i < r_count; ++i)
-	{
-                /*
-	  printf ("%s: Repairing %d,%d;%dx%d\n", __FUNCTION__,
-		     r_damage[i].x,
-		     r_damage[i].y,
-		     r_damage[i].width,
-		     r_damage[i].height);
-                     */
-	  clutter_x11_texture_pixmap_update_area (
-			CLUTTER_X11_TEXTURE_PIXMAP (cclient->priv->texture),
-			r_damage[i].x,
-			r_damage[i].y,
-			r_damage[i].width,
-			r_damage[i].height);
-	}
-
-      XFree (r_damage);
-    }
-  else if (r_damage)
-    {
-          /*
-      printf ("%s: r_count %d >= 3, bounding box (%d %d %d %d) repair\n",
-              __FUNCTION__, r_count, r_bounds.x, r_bounds.y,
-              r_bounds.width, r_bounds.height);
-              */
       clutter_x11_texture_pixmap_update_area (
 			CLUTTER_X11_TEXTURE_PIXMAP (cclient->priv->texture),
 			r_bounds.x, r_bounds.y,