summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-09-10 04:29:14 +0000
committerElijah Newren <newren@src.gnome.org>2006-09-10 04:29:14 +0000
commit189c8b9b11363815da870c0f08211f3dfb38b9a2 (patch)
tree163650db232b610c18b89d53f32e5390f02f3b6c
parent555d7dc90c12af635a38f0f9f2fa26bd90a545bb (diff)
downloadmetacity-189c8b9b11363815da870c0f08211f3dfb38b9a2.tar.gz
Fix build when XKB not found. #354211
2006-09-09 Elijah Newren <newren gmail com> * src/display.c (meta_display_open): Fix build when XKB not found. #354211
-rw-r--r--ChangeLog5
-rw-r--r--src/display.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b66079ed..a927b34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-09-09 Elijah Newren <newren gmail com>
+ * src/display.c (meta_display_open): Fix build when XKB not found.
+ #354211
+
+2006-09-09 Elijah Newren <newren gmail com>
+
Avoid a stuck grab, preventing focus from being transferred
between windows. Thanks to Fryderyk Dziarmagowski for steps to
reproduce. Fixes at least part of #354422.
diff --git a/src/display.c b/src/display.c
index 7a93c3be..8a483f02 100644
--- a/src/display.c
+++ b/src/display.c
@@ -540,7 +540,9 @@ meta_display_open (void)
display->grab_resize_timeout_id = 0;
display->grab_have_keyboard = FALSE;
+#ifdef HAVE_XKB
display->last_bell_time = 0;
+#endif
display->grab_op = META_GRAB_OP_NONE;
display->grab_wireframe_active = FALSE;