[mutter] Accept an empty string as well as "disabled" for keybindings
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [mutter] Accept an empty string as well as "disabled" for keybindings
- Date: Thu, 11 Feb 2010 18:07:32 +0000 (UTC)
commit 4d62977c7b83ac7d6dd02eddca3f3269e5308525
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 7f2fac5..1d10352 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -773,7 +773,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);
@@ -860,7 +860,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]