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/gdktestutils-x11.c | |
| parent | 2d7583c0e32168a89168a1fbc40155122db1bfe9 (diff) | |
| download | gtk+-fa33839d72e54e67fa01e9063e2b03a7e1fdaf68.tar.gz | |
Consistently use per-display error traps in the X11 backend
Diffstat (limited to 'gdk/x11/gdktestutils-x11.c')
| -rw-r--r-- | gdk/x11/gdktestutils-x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c index 960301b1e3..d21d321d81 100644 --- a/gdk/x11/gdktestutils-x11.c +++ b/gdk/x11/gdktestutils-x11.c @@ -147,7 +147,7 @@ gdk_test_simulate_key (GdkWindow *window, g_free (keys); if (!success) return FALSE; - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (GDK_WINDOW_DISPLAY (window)); xev.same_screen = XTranslateCoordinates (xev.display, xev.window, xev.root, xev.x, xev.y, &xev.x_root, &xev.y_root, &xev.subwindow); @@ -158,7 +158,7 @@ gdk_test_simulate_key (GdkWindow *window, success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y); success &= 0 != XSendEvent (xev.display, xev.window, True, key_pressrelease == GDK_KEY_PRESS ? KeyPressMask : KeyReleaseMask, (XEvent*) &xev); XSync (xev.display, False); - success &= 0 == gdk_error_trap_pop(); + success &= 0 == gdk_x11_display_error_trap_pop (GDK_WINDOW_DISPLAY (window)); return success; } @@ -235,7 +235,7 @@ gdk_test_simulate_button (GdkWindow *window, xev.y_root = 0; xev.state = modifiers; xev.button = button; - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (GDK_WINDOW_DISPLAY (window)); xev.same_screen = XTranslateCoordinates (xev.display, xev.window, xev.root, xev.x, xev.y, &xev.x_root, &xev.y_root, &xev.subwindow); @@ -245,6 +245,6 @@ gdk_test_simulate_button (GdkWindow *window, success &= 0 != XWarpPointer (xev.display, None, xev.window, 0, 0, 0, 0, xev.x, xev.y); success &= 0 != XSendEvent (xev.display, xev.window, True, button_pressrelease == GDK_BUTTON_PRESS ? ButtonPressMask : ButtonReleaseMask, (XEvent*) &xev); XSync (xev.display, False); - success &= 0 == gdk_error_trap_pop(); + success &= 0 == gdk_x11_display_error_trap_pop(GDK_WINDOW_DISPLAY (window)); return success; } |