From d5369aa9bf06fc0e984e54c30a78d1e4d3b5fb3a Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Sun, 13 Jul 2008 22:54:19 +0000 Subject: [PATCH] 2008-07-13 Matthew Allum * clutter/x11/clutter-x11-texture-pixmap.c: Call XSync in unredirect X error trap (Thanks to Andy Wingo) --- ChangeLog | 5 +++++ clutter/x11/clutter-x11-texture-pixmap.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66442489a..7cdc3eedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-13 Matthew Allum + + * clutter/x11/clutter-x11-texture-pixmap.c: + Call XSync in unredirect X error trap (Thanks to Andy Wingo) + 2008-07-13 Neil Roberts * build/mingw/mingw-cross-compile.sh: Avoid using the --strip diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index 3bf6b7401..c4efe4c2f 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -985,7 +985,7 @@ clutter_x11_texture_pixmap_set_window (ClutterX11TexturePixmap *texture, priv->window, priv->window_redirect_automatic ? CompositeRedirectAutomatic : CompositeRedirectManual); - + XSync (clutter_x11_get_default_display (), False); clutter_x11_untrap_x_errors (); }