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

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-01-28 15:38:28 +0200 (Wed, 28 Jan 2009)
New Revision: 17307

Modified:
   projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c
   projects/haf/trunk/clutter/debian/changelog
Log:
androide's patch for clutter-x11-texture-pixmap


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-28 12:19:34 UTC (rev 17306)
+++ projects/haf/trunk/clutter/clutter/x11/clutter-x11-texture-pixmap.c	2009-01-28 13:38:28 UTC (rev 17307)
@@ -329,13 +329,12 @@
 
   priv = texture->priv;
 
-  if (xev->xany.window != priv->window)
-    return CLUTTER_X11_FILTER_CONTINUE;
-
   switch (xev->type) {
   case MapNotify:
   case ConfigureNotify:
     {
+      if (((XConfigureEvent *)xev)->window != priv->window)
+        break;
       /* Only sync the window pixmap if the size has changed */
       if (xev->xconfigure.width != priv->pixmap_width ||
           xev->xconfigure.height != priv->pixmap_height)
@@ -343,9 +342,13 @@
       break;
     }
   case UnmapNotify:
+    if (((XUnmapEvent *)xev)->window != priv->window)
+      break;
     clutter_x11_texture_pixmap_set_mapped (texture, FALSE);
     break;
   case DestroyNotify:
+    if (((XDestroyWindowEvent *)xev)->window != priv->window)
+      break;
     clutter_x11_texture_pixmap_destroyed (texture);
     break;
   default:

Modified: projects/haf/trunk/clutter/debian/changelog
===================================================================
--- projects/haf/trunk/clutter/debian/changelog	2009-01-28 12:19:34 UTC (rev 17306)
+++ projects/haf/trunk/clutter/debian/changelog	2009-01-28 13:38:28 UTC (rev 17307)
@@ -1,6 +1,7 @@
 clutter (0.8.2-0maemo15~unreleased) unstable; urgency=low
 
-  * unreleased
+  * Added Adam Endrodi's patch for DestroyNotify events causing the pixmap 
+    to be destroyed in x11-texture-pixmap
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 26 Jan 2009 10:06:23 +0200