[gnome-settings-daemon/wip/benzea/cleanups-and-small-fixes: 45/47] common: Use X11 specific functions for error trapping
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/wip/benzea/cleanups-and-small-fixes: 45/47] common: Use X11 specific functions for error trapping
- Date: Fri, 22 Mar 2019 12:23:57 +0000 (UTC)
commit 610b214688cd751811bf3b3d1dee9d36698fbc71
Author: Benjamin Berg <bberg redhat com>
Date: Tue Feb 26 11:25:11 2019 +0100
common: Use X11 specific functions for error trapping
This fixes more compile time warnings.
plugins/common/gsd-input-helper.c | 6 +++---
1 file 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]