From b031543f5ad4fb486b2c18bf1f7d950be5182d39 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Mon, 22 Nov 2010 16:10:34 -0500
Subject: [PATCH] Fix updating overlay key keycode when keymap changes

overlay_key_combo needs the same treatment as other keycodes on a
change - we should always recompute it if we have a keysym not
a keycode, and not only if the keycode hasn't already been
computed.
---
 src/core/keybindings.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index ef3583ee2..6d93e9733 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -233,9 +233,8 @@ reload_keycodes (MetaDisplay *display)
 {
   meta_topic (META_DEBUG_KEYBINDINGS,
               "Reloading keycodes for binding tables\n");
-  
-  if (display->overlay_key_combo.keysym 
-      && display->overlay_key_combo.keycode == 0)
+
+  if (display->overlay_key_combo.keysym != 0)
     {
       display->overlay_key_combo.keycode = XKeysymToKeycode (
           display->xdisplay, display->overlay_key_combo.keysym);