diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-12-15 02:05:05 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:06:59 -0500 |
| commit | fa33839d72e54e67fa01e9063e2b03a7e1fdaf68 (patch) | |
| tree | 2972f8fd6ef842f27cb485c76e29557eb75a22d9 /gdk/x11/gdkdevice-xi.c | |
| parent | 2d7583c0e32168a89168a1fbc40155122db1bfe9 (diff) | |
| download | gtk+-fa33839d72e54e67fa01e9063e2b03a7e1fdaf68.tar.gz | |
Consistently use per-display error traps in the X11 backend
Diffstat (limited to 'gdk/x11/gdkdevice-xi.c')
| -rw-r--r-- | gdk/x11/gdkdevice-xi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c index e7dfb0ca6a..19e8ff1177 100644 --- a/gdk/x11/gdkdevice-xi.c +++ b/gdk/x11/gdkdevice-xi.c @@ -151,11 +151,11 @@ gdk_device_xi_constructed (GObject *object) device = GDK_DEVICE_XI (object); display = gdk_device_get_display (GDK_DEVICE (object)); - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (display); device->xdevice = XOpenDevice (GDK_DISPLAY_XDISPLAY (display), device->device_id); - if (gdk_error_trap_pop ()) + if (gdk_x11_display_error_trap_pop (display)) g_warning ("Device %s can't be opened", gdk_device_get_name (GDK_DEVICE (device))); |