[maemo-commits] [maemo-commits] r17100 - in projects/haf/trunk/clutter: clutter/x11 debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-01-12 15:04:49 +0200 (Mon, 12 Jan 2009)
New Revision: 17100

Modified:
   projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c
   projects/haf/trunk/clutter/debian/changelog
Log:
Reinstated XDamage and XComposite as something in it reverted bug 95594 
    (and multiple XDamage shouldn't be an issue with the next bunch of work
    I'm working on)



Modified: projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c
===================================================================
--- projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c	2009-01-12 12:34:05 UTC (rev 17099)
+++ projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c	2009-01-12 13:04:49 UTC (rev 17100)
@@ -47,6 +47,11 @@
 
 #include "cogl/cogl.h"
 
+/* We need this back on because the lack of notifications for Configure causes
+ * textures not to update when they change size, and bug 95594 to revert
+ */
+#define XDAMAGE_HANDLING
+
 #ifdef XDAMAGE_HANDLING
 #include <X11/extensions/Xdamage.h>
 #endif

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-01-12 12:34:05 UTC (rev 17099)
+++ projects/haf/trunk/clutter/debian/changelog	2009-01-12 13:04:49 UTC (rev 17100)
@@ -7,12 +7,17 @@
     and instead do it only when width/height/depth changes (gw)
   * Set up xevent handlers in clutter-x11-texture-pixmap.c only if
     XDAMAGE_HANDLING is defined. This avoids doing damage handling twice for
-    application windows and should avoid some surprises in libmatchbox2 side.
+    application windows and should avoid some surprises in libmatchbox2 side
+    (kh).
   * Do not alter XComposite redirections in clutter-x11-texture-pixmap.c, that
-    belongs to the window manager.
+    belongs to the window manager (kh).
   * Removed some un-needed log messages for EGLX textures (gw)
   * Set damage to update the whole screen after a 'pick' event (as it will have
     destroyed the buffer)
+  * Commented out extra code that caused clutter to not compile with -Werror
+  * Reinstated XDamage and XComposite as something in it reverted bug 95594 
+    (and multiple XDamage shouldn't be an issue with the next bunch of work
+    I'm working on)
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Wed, 12 Jan 2009 12:17:52 +0000