Skip to content

Commit c49a780

Browse files
author
raveit65
committed
mate-bg-crossfade: replace deprecated gdk_error_trap_push/pop
1 parent 5e16dc1 commit c49a780

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

libmate-desktop/mate-bg-crossfade.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,15 @@ draw_background (MateBGCrossfade *fade)
426426
cairo_region_destroy (region);
427427
} else {
428428
Display *xdisplay = GDK_WINDOW_XDISPLAY (fade->priv->window);
429-
gdk_error_trap_push ();
429+
GdkDisplay *display;
430+
display = gdk_display_get_default ();
431+
gdk_x11_display_error_trap_push (display);
430432
XGrabServer (xdisplay);
431433
XClearWindow (xdisplay, GDK_WINDOW_XID (fade->priv->window));
432434
send_root_property_change_notification (fade);
433435
XFlush (xdisplay);
434436
XUngrabServer (xdisplay);
435-
gdk_error_trap_pop_ignored ();
437+
gdk_x11_display_error_trap_pop_ignored (display);
436438
}
437439
}
438440

@@ -588,7 +590,7 @@ get_root_pixmap_id_surface (GdkDisplay *display)
588590
int x_ret, y_ret;
589591
unsigned int w_ret, h_ret, bw_ret, depth_ret;
590592

591-
gdk_error_trap_push ();
593+
gdk_x11_display_error_trap_push (display);
592594
if (XGetGeometry (xdisplay, pixmap, &root_ret,
593595
&x_ret, &y_ret, &w_ret, &h_ret,
594596
&bw_ret, &depth_ret))
@@ -598,7 +600,7 @@ get_root_pixmap_id_surface (GdkDisplay *display)
598600
w_ret, h_ret);
599601
}
600602

601-
gdk_error_trap_pop_ignored ();
603+
gdk_x11_display_error_trap_pop_ignored (display);
602604
XFree (data);
603605
}
604606

0 commit comments

Comments
 (0)