[mutter] keybindings: Fix unsetting of overlay-key

[Florian MÃllner <fmuellner src gnome org>]

commit 6a32fa94524a1d673cdabdef34dd0e55ad0d5689
Author: Florian MÃllner <fmuellner gnome org>
Date:   Wed Aug 29 21:03:31 2012 +0200

    keybindings: Fix unsetting of overlay-key
    
    Commit 802c1ac4275 fixed updating the overlay key on settings
    changes, but missed the case where the setting was set to an
    empty value to disable the overlay key altogether.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682993

 src/core/keybindings.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index edfaa2c..0fb5f70 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -292,6 +292,10 @@ reload_keycodes (MetaDisplay *display)
       display->overlay_key_combo.keycode =
         keysym_to_keycode (display, display->overlay_key_combo.keysym);
     }
+  else
+    {
+      display->overlay_key_combo.keycode = 0;
+    }
   
   if (display->key_bindings)
     {
@@ -469,11 +473,7 @@ rebuild_special_bindings (MetaDisplay *display)
   MetaKeyCombo combo;
   
   meta_prefs_get_overlay_binding (&combo);
-
-  if (combo.keysym != None || combo.keycode != 0)
-    {
-      display->overlay_key_combo = combo;
-    }
+  display->overlay_key_combo = combo;
 }
 
 static void