Skip to content

Commit

Permalink
pluma-utils.c: avoid deprecated 'gdk_error_trap_push/pop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sc0w
sc0w committed Jun 1, 2018
1 parent 924beb5 commit be05278
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pluma/pluma-utils.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -863,12 +863,12 @@ pluma_utils_get_current_workspace (GdkScreen *screen)
root_win = gdk_screen_get_root_window (screen); root_win = gdk_screen_get_root_window (screen);
display = gdk_screen_get_display (screen); display = gdk_screen_get_display (screen);


gdk_error_trap_push (); gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_CURRENT_DESKTOP"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (gpointer) &current_desktop); &bytes_after, (gpointer) &current_desktop);
err = gdk_error_trap_pop (); err = gdk_x11_display_error_trap_pop (display);


if (err != Success || result != Success) if (err != Success || result != Success)
return ret; return ret;
Expand Down Expand Up @@ -914,12 +914,12 @@ pluma_utils_get_window_workspace (GtkWindow *gtkwindow)
window = gtk_widget_get_window (GTK_WIDGET (gtkwindow)); window = gtk_widget_get_window (GTK_WIDGET (gtkwindow));
display = gdk_window_get_display (window); display = gdk_window_get_display (window);


gdk_error_trap_push (); gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (gpointer) &workspace); &bytes_after, (gpointer) &workspace);
err = gdk_error_trap_pop (); err = gdk_x11_display_error_trap_pop (display);


if (err != Success || result != Success) if (err != Success || result != Success)
return ret; return ret;
Expand Down Expand Up @@ -970,12 +970,12 @@ pluma_utils_get_current_viewport (GdkScreen *screen,
root_win = gdk_screen_get_root_window (screen); root_win = gdk_screen_get_root_window (screen);
display = gdk_screen_get_display (screen); display = gdk_screen_get_display (screen);


gdk_error_trap_push (); gdk_x11_display_error_trap_push (display);
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win), result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (root_win),
gdk_x11_get_xatom_by_name_for_display (display, "_NET_DESKTOP_VIEWPORT"), gdk_x11_get_xatom_by_name_for_display (display, "_NET_DESKTOP_VIEWPORT"),
0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, (void*) &coordinates); &bytes_after, (void*) &coordinates);
err = gdk_error_trap_pop (); err = gdk_x11_display_error_trap_pop (display);


if (err != Success || result != Success) if (err != Success || result != Success)
return; return;
Expand Down

0 comments on commit be05278

Please sign in to comment.