summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkdisplay-x11.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2009-01-23 15:05:44 +0100
committerAlexander Larsson <alex@localhost.localdomain>2009-04-02 10:15:26 +0200
commite60af9d3157486fd5ca671ae63200de5024b9105 (patch)
tree964c0806d3ac43f8bdfd43508b0ec97ddfc99267 /gdk/x11/gdkdisplay-x11.c
parentc0ad534d818881dc044e4a621dffe602ed186e80 (diff)
downloadgtk+-e60af9d3157486fd5ca671ae63200de5024b9105.tar.gz
Move keyboard grab info to common code
This is the first stage in tracking keyboard grabs in the common code. This lets us handle destroying or unmapping virtual window with a keyboard grab.
Diffstat (limited to 'gdk/x11/gdkdisplay-x11.c')
-rw-r--r--gdk/x11/gdkdisplay-x11.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 37199c3887..cbda73414b 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -650,9 +650,9 @@ gdk_display_keyboard_ungrab (GdkDisplay *display,
XFlush (xdisplay);
if (time == GDK_CURRENT_TIME ||
- display_x11->keyboard_xgrab_time == GDK_CURRENT_TIME ||
- !XSERVER_TIME_IS_LATER (display_x11->keyboard_xgrab_time, time))
- display_x11->keyboard_xgrab_window = NULL;
+ display->keyboard_grab.time == GDK_CURRENT_TIME ||
+ !XSERVER_TIME_IS_LATER (display->keyboard_grab.time, time))
+ display->keyboard_grab.window = NULL;
}
/**