[maemo-commits] [maemo-commits] r18600 - projects/haf/trunk/clutter0.8/clutter/x11

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-06-03 19:44:22 +0300 (Wed, 03 Jun 2009)
New Revision: 18600

Modified:
   projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c
Log:
clutter_x11_texture_pixmap_set_redirection: add missing X error trap


Modified: projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c	2009-06-03 15:31:03 UTC (rev 18599)
+++ projects/haf/trunk/clutter0.8/clutter/x11/clutter-x11-texture-pixmap.c	2009-06-03 16:44:22 UTC (rev 18600)
@@ -1108,13 +1108,15 @@
 
   if (setting && !priv->window_redirected && priv->window)
     {
+      clutter_x11_trap_x_errors ();
       XCompositeRedirectWindow (dpy,
                                 priv->window,
                                 priv->window_redirect_automatic ?
                                 CompositeRedirectAutomatic :
                                 CompositeRedirectManual);
+      priv->window_redirected = TRUE;
       XSync (dpy, False);
-      priv->window_redirected = TRUE;
+      clutter_x11_untrap_x_errors ();
     }
   else if (!setting && priv->window_redirected && priv->window)
     {
@@ -1124,9 +1126,9 @@
                                   priv->window_redirect_automatic ?
                                   CompositeRedirectAutomatic :
                                   CompositeRedirectManual);
-      XSync (clutter_x11_get_default_display (), False);
+      priv->window_redirected = FALSE;
+      XSync (dpy, False);
       clutter_x11_untrap_x_errors ();
-      priv->window_redirected = FALSE;
     }
 }