From b4dcd38a04c6ab44da5d8ac63b386419c9bda7a4 Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sat, 5 Jan 2019 13:31:01 +0100
Subject: errors.c: avoid deprecated 'gdk_error_trap...' functions:

avoid deprecated:

gdk_error_trap_push
gdk_error_trap_pop_ignored
gdk_error_trap_pop
---
 src/core/errors.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/errors.c b/src/core/errors.c
index 19d2e015..18128097 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -28,31 +28,32 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 void
 meta_error_trap_push (MetaDisplay *display)
 {
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));
 }
 
 void
 meta_error_trap_pop (MetaDisplay *display,
                      gboolean     last_request_was_roundtrip)
 {
-  gdk_error_trap_pop_ignored ();
+  gdk_x11_display_error_trap_pop_ignored (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));
 }
 
 void
 meta_error_trap_push_with_return (MetaDisplay *display)
 {
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));
 }
 
 int
 meta_error_trap_pop_with_return  (MetaDisplay *display,
                                   gboolean     last_request_was_roundtrip)
 {
-  return gdk_error_trap_pop ();
+  return gdk_x11_display_error_trap_pop (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));
 }
 
-- 
cgit v1.2.1