[metacity] Accept an empty string as well as "disabled" for	keybindings
- From: Alberts Muktupāvels <muktupavels src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [metacity] Accept an empty string as well as "disabled" for	keybindings
 
- Date: Fri, 21 Jul 2017 10:43:43 +0000 (UTC)
 
commit 564cf4faa86536f6c7d43de43add341cdbcdaa19
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Fri Nov 20 10:19:03 2009 -0500
    Accept an empty string as well as "disabled" for keybindings
    
    Treat the empty string the same as "disabled" for GConf keybinding
    keys. gnome-keybinding-properties was changed to write disabled
    keys as the empty string a year or so ago.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=559816
 src/ui/ui.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/ui/ui.c b/src/ui/ui.c
index cf42925..a72bfa4 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -956,7 +956,7 @@ meta_ui_parse_accelerator (const char          *accel,
   *keycode = 0;
   *mask = 0;
 
-  if (strcmp (accel, "disabled") == 0)
+  if (!accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
 
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
@@ -1006,7 +1006,7 @@ meta_ui_parse_modifier (const char          *accel,
 
   *mask = 0;
 
-  if (accel == NULL || strcmp (accel, "disabled") == 0)
+  if (accel == NULL || !accel[0] || strcmp (accel, "disabled") == 0)
     return TRUE;
 
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]