[maemo-commits] [maemo-commits] r17902 - projects/haf/trunk/clutter/debian/patches

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-03-31 14:04:26 +0300 (Tue, 31 Mar 2009)
New Revision: 17902

Added:
   projects/haf/trunk/clutter/debian/patches/20-stage-eglx-crash.patch
Log:
This fixes NB#98601, NB#104132, and contains Artem's patch for 
clutter-gtk support


Added: projects/haf/trunk/clutter/debian/patches/20-stage-eglx-crash.patch
===================================================================
--- projects/haf/trunk/clutter/debian/patches/20-stage-eglx-crash.patch	2009-03-31 09:41:28 UTC (rev 17901)
+++ projects/haf/trunk/clutter/debian/patches/20-stage-eglx-crash.patch	2009-03-31 11:04:26 UTC (rev 17902)
@@ -0,0 +1,29 @@
+This fixes NB#98601, NB#104132, and contains Artem's patch for clutter-gtk support
+Index: clutter/x11/clutter-stage-x11.c
+===================================================================
+--- a/clutter/x11/clutter-stage-x11.c	(revision 17758)
++++ b/clutter/x11/clutter-stage-x11.c	(revision 17759)
+@@ -719,7 +719,7 @@
+   if (clutter_x11_untrap_x_errors () ||
+       !status ||
+       width == 0 || height == 0 ||
+-      depth != stage_x11->xvisinfo->depth)
++      (stage_x11->xvisinfo && depth != stage_x11->xvisinfo->depth))
+     {
+       g_warning ("Unable to retrieve the new window geometry");
+       return FALSE;
+Index: clutter/clutter-actor.c
+===================================================================
+--- a/clutter/clutter-actor.c	(revision 17687)
++++ b/clutter/clutter-actor.c	(revision 17688)
+@@ -3039,7 +3039,8 @@
+ 
+   g_return_if_fail (CLUTTER_IS_ACTOR (self));
+ 
+-  if (!self->priv->allow_redraw)
++  if (!self->priv->allow_redraw ||
++      (CLUTTER_PRIVATE_FLAGS (self) & CLUTTER_ACTOR_IN_DESTRUCTION))
+     return;
+ 
+   clutter_actor_notify_modified( self );
+