[gedit] utils: remove deprecated usage of gdk_error_trap_* family
- From: Sébastien Lafargue <slafargue src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] utils: remove deprecated usage of gdk_error_trap_* family
- Date: Wed, 28 Nov 2018 22:08:45 +0000 (UTC)
commit a46db9ab3de895ec220e3f6a2f6965e430fed2fd
Author: Sebastien Lafargue <slafargue gnome org>
Date: Wed Nov 28 12:28:13 2018 +0100
utils: remove deprecated usage of gdk_error_trap_* family
gedit/gedit-utils.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c
index 4ae3130e4..d5c8783b0 100644
--- a/gedit/gedit-utils.c
+++ b/gedit/gedit-utils.c
@@ -575,12 +575,12 @@ gedit_utils_get_current_workspace (GdkScreen *screen)
guint *current_desktop;
gint err, result;
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win),
gdk_x11_get_xatom_by_name_for_display (display,
"_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (gpointer) ¤t_desktop);
- err = gdk_error_trap_pop ();
+ err = gdk_x11_display_error_trap_pop (display);
if (err != Success || result != Success)
return ret;
@@ -633,12 +633,12 @@ gedit_utils_get_window_workspace (GtkWindow *gtkwindow)
if (GDK_IS_X11_DISPLAY (display))
{
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display,
"_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (gpointer) &workspace);
- err = gdk_error_trap_pop ();
+ err = gdk_x11_display_error_trap_pop (display);
if (err != Success || result != Success)
return ret;
@@ -694,12 +694,12 @@ gedit_utils_get_current_viewport (GdkScreen *screen,
if (GDK_IS_X11_DISPLAY (display))
{
- gdk_error_trap_push ();
+ gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win),
gdk_x11_get_xatom_by_name_for_display (display,
"_NET_DESKTOP_VIEWPORT"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (void*) &coordinates);
- err = gdk_error_trap_pop ();
+ err = gdk_x11_display_error_trap_pop (display);
if (err != Success || result != Success)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]