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

common: Update to gdk/x11 API

Browse source 
We use gdk_error_trap*() in this little piece of remaining x11
code. Update to gdk_x11_display_error_trap*() found more recent
gtk.
This commit is contained in:
Carlos Garnacho 2019-07-27 11:26:29 +02:00 • committed by Georges Basile Stavracas Neto
parent 7e6301d449
commit f57a117cc1
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
panels/common/gsd-input-helper.c
View file

@ -60,6 +60,7 @@ mouse_is_present (void)
char * char *
xdevice_get_device_node (int deviceid) xdevice_get_device_node (int deviceid)
{ {
GdkDisplay *display;
Atom prop; Atom prop;
Atom act_type; Atom act_type;
int act_format; int act_format;
@ -67,22 +68,23 @@ xdevice_get_device_node (int deviceid)
unsigned char *data; unsigned char *data;
char *ret; char *ret;
gdk_display_sync (gdk_display_get_default ()); display = gdk_display_get_default ();
gdk_display_sync (display);
prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Device Node", False); prop = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "Device Node", False);
if (!prop) if (!prop)
return NULL; return NULL;
gdk_error_trap_push (); gdk_x11_display_error_trap_push (display);
if (!XIGetProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), if (!XIGetProperty (GDK_DISPLAY_XDISPLAY (display),
deviceid, prop, 0, 1000, False, deviceid, prop, 0, 1000, False,
AnyPropertyType, &act_type, &act_format, AnyPropertyType, &act_type, &act_format,
&nitems, &bytes_after, &data) == Success) { &nitems, &bytes_after, &data) == Success) {
gdk_error_trap_pop_ignored (); gdk_x11_display_error_trap_pop_ignored (display);
return NULL; return NULL;
} }
if (gdk_error_trap_pop ()) if (gdk_x11_display_error_trap_pop (display))
goto out; goto out;
if (nitems == 0) if (nitems == 0)