applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mouse: Remove deprecated gdk_error_trap_push|pop calls

Browse source 
Replace with gdk_x11_display_error_trap_push|pop

https://gitlab.gnome.org/GNOME/gnome-control-center/issues/20
This commit is contained in:
Jeremy Bicha 2018-12-04 15:34:21 -05:00 • committed by Georges Basile Stavracas Neto
parent 3d686de41c
commit 35679c6877
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
panels/mouse/cc-mouse-caps-helper.c
View file

@ -29,6 +29,7 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
gboolean *have_edge_scrolling, gboolean *have_edge_scrolling,
gboolean *have_tap_to_click) gboolean *have_tap_to_click)
{ {
GdkDisplay *gdisplay;
Display *display; Display *display;
g_autoptr(GList) devicelist = NULL; g_autoptr(GList) devicelist = NULL;
GList *l; GList *l;
@ -37,6 +38,7 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
unsigned long nitems, bytes_after; unsigned long nitems, bytes_after;
unsigned char *data; unsigned char *data;
gdisplay = gdk_display_get_default ();
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False); prop_scroll_methods = XInternAtom (display, "libinput Scroll Methods Available", False);
prop_tapping_enabled = XInternAtom (display, "libinput Tapping Enabled", False); prop_tapping_enabled = XInternAtom (display, "libinput Tapping Enabled", False);
@ -47,7 +49,7 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
*have_edge_scrolling = FALSE; *have_edge_scrolling = FALSE;
*have_tap_to_click = FALSE; *have_tap_to_click = FALSE;
gdk_error_trap_push (); gdk_x11_display_error_trap_push (gdisplay);
devicelist = gdk_seat_get_slaves (gdk_display_get_default_seat (gdk_display_get_default ()), devicelist = gdk_seat_get_slaves (gdk_display_get_default_seat (gdk_display_get_default ()),
GDK_SEAT_CAPABILITY_ALL_POINTING); GDK_SEAT_CAPABILITY_ALL_POINTING);
@ -81,7 +83,7 @@ touchpad_check_capabilities_x11 (gboolean *have_two_finger_scrolling,
} }
} }
gdk_error_trap_pop_ignored (); gdk_x11_display_error_trap_pop_ignored (gdisplay);
return TRUE; return TRUE;
} }
@ -105,6 +107,7 @@ cc_touchpad_check_capabilities (gboolean *have_two_finger_scrolling,
gboolean gboolean
cc_synaptics_check (void) cc_synaptics_check (void)
{ {
GdkDisplay *gdisplay;
Display *display; Display *display;
g_autoptr(GList) devicelist = NULL; g_autoptr(GList) devicelist = NULL;
GList *l; GList *l;
@ -117,10 +120,11 @@ cc_synaptics_check (void)
if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
return FALSE; return FALSE;
gdisplay = gdk_display_get_default ();
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
prop = XInternAtom (display, "Synaptics Capabilities", False); prop = XInternAtom (display, "Synaptics Capabilities", False);
gdk_error_trap_push (); gdk_x11_display_error_trap_push (gdisplay);
devicelist = gdk_seat_get_slaves (gdk_display_get_default_seat (gdk_display_get_default ()), devicelist = gdk_seat_get_slaves (gdk_display_get_default_seat (gdk_display_get_default ()),
GDK_SEAT_CAPABILITY_ALL_POINTING); GDK_SEAT_CAPABILITY_ALL_POINTING);
@ -138,7 +142,7 @@ cc_synaptics_check (void)
break; break;
} }
gdk_error_trap_pop_ignored (); gdk_x11_display_error_trap_pop_ignored (gdisplay);
return have_synaptics; return have_synaptics;
} }