From 11e421ee416870992414c21c02a836f30e00d838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Wed, 23 Sep 2015 17:15:25 +0300
Subject: effects: remove hack that made Marco crash in certain situations

fixes https://github.com/mate-desktop/marco/issues/200

ported to Marco from https://github.com/GNOME/metacity/commit/f25b7760b7430b674afdb4de1e2072cd99ea3fbc
---
 src/core/effects.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'src/core/effects.c')

diff --git a/src/core/effects.c b/src/core/effects.c
index 469184e2..163ec054 100644
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -316,23 +316,6 @@ update_wireframe_window (MetaDisplay         *display,
 }
 #endif
 
-/**
- * A hack to force the X server to synchronize with the
- * graphics hardware.
- */
-static void
-graphics_sync (BoxAnimationContext *context)
-{
-  XImage *image;
-
-  image = XGetImage (context->screen->display->xdisplay,
-                     context->screen->xroot,
-                     0, 0, 1, 1,
-                     AllPlanes, ZPixmap);
-
-  XDestroyImage (image);
-}
-
 static gboolean
 effects_draw_box_animation_timeout (BoxAnimationContext *context)
 {
@@ -383,8 +366,6 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
                  context->gc);
 #endif /* !HAVE_SHAPE */
 
-      graphics_sync (context);
-
       context->finished(context->finished_data);
 
       g_free (context);
@@ -425,7 +406,7 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
 #endif /* !HAVE_SHAPE */
 
   /* kick changes onto the server */
-  graphics_sync (context);
+  XFlush (context->screen->display->xdisplay);
 
   return TRUE;
 }
-- 
cgit v1.2.1