[mutter] prefs: Don't parse modifiers for the overlay-key



commit 7bccd4f22f886f63b7645247de308627062316dd
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Jan 6 18:35:32 2015 -0800

    prefs: Don't parse modifiers for the overlay-key
    
    We don't actually accept modifiers for the overlay key.

 src/core/prefs.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/core/prefs.c b/src/core/prefs.c
index b8978d7..ff38f14 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -1672,9 +1672,10 @@ overlay_key_handler (GVariant *value,
   *result = NULL; /* ignored */
   string_value = g_variant_get_string (value, NULL);
 
-  if (string_value && meta_parse_accelerator (string_value, &combo.keysym,
+  if (string_value && meta_parse_accelerator (string_value,
+                                              &combo.keysym,
                                               &combo.keycode,
-                                              &combo.modifiers))
+                                              NULL))
     ;
   else
     {
@@ -1684,8 +1685,7 @@ overlay_key_handler (GVariant *value,
     }
 
   if (overlay_key_combo.keysym != combo.keysym ||
-      overlay_key_combo.keycode != combo.keycode ||
-      overlay_key_combo.modifiers != combo.modifiers)
+      overlay_key_combo.keycode != combo.keycode)
     {
       overlay_key_combo = combo;
       queue_changed (META_PREF_KEYBINDINGS);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]