diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2009-11-20 10:19:03 -0500 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2017-07-21 16:16:47 +0300 |
| commit | 04f3e5fd98a076b251920e46471f5060f23ea0af (patch) | |
| tree | 74e8d213f8e9ec5ebed9950d5f1400bd5e774826 | |
| parent | 7cacf68d0bfe58c56471dbeaff47d4949446f59c (diff) | |
| download | metacity-04f3e5fd98a076b251920e46471f5060f23ea0af.tar.gz | |
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
| -rw-r--r-- | 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 aeba1368..3c13d5e4 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -853,7 +853,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); @@ -903,7 +903,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); |