errors.c: avoid deprecated 'gdk_error_trap...' functions:

sc0w · sc0w · commit b4dcd38a04c6 · 2019-01-07T01:44:52.000+01:00
avoid deprecated:

gdk_error_trap_push
gdk_error_trap_pop_ignored
gdk_error_trap_pop
diff --git 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)));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,31 +28,32 @@`
`28`	`28`	`#include <errno.h>`
`29`	`29`	`#include <stdlib.h>`
`30`	`30`	`#include <gdk/gdk.h>`
	`31`	`+#include <gdk/gdkx.h>`
`31`	`32`	`#include <gtk/gtk.h>`
`32`	`33`
`33`	`34`	`void`
`34`	`35`	`meta_error_trap_push (MetaDisplay *display)`
`35`	`36`	`{`
`36`		`- gdk_error_trap_push ();`
	`37`	`+ gdk_x11_display_error_trap_push (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`void`
`40`	`41`	`meta_error_trap_pop (MetaDisplay *display,`
`41`	`42`	`gboolean last_request_was_roundtrip)`
`42`	`43`	`{`
`43`		`- gdk_error_trap_pop_ignored ();`
	`44`	`+ gdk_x11_display_error_trap_pop_ignored (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`void`
`47`	`48`	`meta_error_trap_push_with_return (MetaDisplay *display)`
`48`	`49`	`{`
`49`		`- gdk_error_trap_push ();`
	`50`	`+ gdk_x11_display_error_trap_push (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`int`
`53`	`54`	`meta_error_trap_pop_with_return (MetaDisplay *display,`
`54`	`55`	`gboolean last_request_was_roundtrip)`
`55`	`56`	`{`
`56`		`- return gdk_error_trap_pop ();`
	`57`	`+ return gdk_x11_display_error_trap_pop (gdk_x11_lookup_xdisplay (meta_display_get_xdisplay (display)));`
`57`	`58`	`}`
`58`	`59`