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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-10 11:27:52 +0200 (Sat, 10 Jan 2009)
New Revision: 17083

Modified:
   projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c
   projects/haf/trunk/clutter/debian/changelog
Log:
ifdef composite redirection as well


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-10 08:43:06 UTC (rev 17082)
+++ projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c	2009-01-10 09:27:52 UTC (rev 17083)
@@ -1154,11 +1154,13 @@
         return;
       }
 
+#ifdef XDAMAGE_HANDLING
     XCompositeRedirectWindow
                        (dpy,
                         window,
                         automatic ?
                         CompositeRedirectAutomatic : CompositeRedirectManual);
+#endif
     XSync (dpy, False);
   }
 

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-01-10 08:43:06 UTC (rev 17082)
+++ projects/haf/trunk/clutter/debian/changelog	2009-01-10 09:27:52 UTC (rev 17083)
@@ -3,6 +3,8 @@
   * 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.
+  * Do not alter XComposite redirections in clutter-x11-texture-pixmap.c, that
+    belongs to the window manager.
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 29 Dec 2008 15:25:59 +0200