From c6c1db08970f009fcf2867a1ad2d4556485453ca Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 17 Nov 2018 13:56:15 +0800 Subject: typing-break: replace deprecated gdk_error_trap functions --- typing-break/drw-selection.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/typing-break/drw-selection.c b/typing-break/drw-selection.c index 48b7db55..7b5b05ca 100644 --- a/typing-break/drw-selection.c +++ b/typing-break/drw-selection.c @@ -70,10 +70,14 @@ drw_selection_clear (GtkWidget *widget, static gboolean drw_selection_find_existing (DrwSelection *drw_selection) { - Display *xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + GdkDisplay *display; Window old; + Display *xdisplay; + + display = gdk_display_get_default (); + xdisplay = GDK_DISPLAY_XDISPLAY(display); - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (display); old = XGetSelectionOwner (xdisplay, gdk_x11_get_xatom_by_name (SELECTION_NAME)); if (old) { @@ -82,7 +86,7 @@ drw_selection_find_existing (DrwSelection *drw_selection) } XSync (xdisplay, False); - if (gdk_error_trap_pop () == 0 && drw_selection->owner_window) { + if (gdk_x11_display_error_trap_pop (display) == 0 && drw_selection->owner_window) { gdk_window_add_filter (drw_selection->owner_window, drw_selection_filter, drw_selection); -- cgit v1.2.1