From d219bd4d5a0282090441736a69971f5af86a050d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Sun, 11 Feb 2018 14:50:27 +0000
Subject: [PATCH] x11: Balance an error trap

We are pushing an error trap, and never popping it from the stack.
---
 gdk/x11/gdkdnd-x11.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 09eb1b2ef2..f335d502ce 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2701,7 +2701,7 @@ drag_context_grab (GdkDragContext *context)
 
   g_set_object (&x11_context->grab_seat, seat);
 
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (gdk_window_get_display (x11_context->ipc_window));
 
   for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
     {
@@ -2753,6 +2753,8 @@ drag_context_grab (GdkDragContext *context)
         }
     }
 
+  gdk_x11_display_error_trap_pop_ignored (gdk_window_get_display (x11_context->ipc_window));
+
   return TRUE;
 }