diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-02-26 11:25:11 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-03-22 13:20:22 +0100 |
| commit | 610b214688cd751811bf3b3d1dee9d36698fbc71 (patch) | |
| tree | fcdb809d265fee90a9c8ed08838cd437bbb6e8bc | |
| parent | cdb999de1136fbf80fe16426d9094b373d848cfc (diff) | |
| download | gnome-settings-daemon-610b214688cd751811bf3b3d1dee9d36698fbc71.tar.gz | |
common: Use X11 specific functions for error trapping
This fixes more compile time warnings.
| -rw-r--r-- | plugins/common/gsd-input-helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c index 80b70df5..d806ccf3 100644 --- a/plugins/common/gsd-input-helper.c +++ b/plugins/common/gsd-input-helper.c @@ -46,16 +46,16 @@ xdevice_get_device_node (int deviceid) if (!prop) return NULL; - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (gdk_display_get_default ()); if (!XIGetProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), deviceid, prop, 0, 1000, False, AnyPropertyType, &act_type, &act_format, &nitems, &bytes_after, &data) == Success) { - gdk_error_trap_pop_ignored (); + gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ()); return NULL; } - if (gdk_error_trap_pop ()) + if (gdk_x11_display_error_trap_pop (gdk_display_get_default ())) goto out; if (nitems == 0) |