summaryrefslogtreecommitdiffstats
path: root/metacity-2.28-empty-keybindings.patch
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2015-04-29 21:44:29 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2015-07-15 00:58:04 -0500
commit9e0257d35f9c40dfb8a9dda2b96f390fef948ce8 (patch)
treeb3257f786a901b53db27476cb53f41c419f0463f /metacity-2.28-empty-keybindings.patch
parent964bcda616b4f73441c7d0da2d99c6c202b03184 (diff)
downloadmetacity-9e0257d35f9c40dfb8a9dda2b96f390fef948ce8.zip
metacity-9e0257d35f9c40dfb8a9dda2b96f390fef948ce8.tar.gz
metacity-9e0257d35f9c40dfb8a9dda2b96f390fef948ce8.tar.xz
metacity 3.14.3
Diffstat (limited to 'metacity-2.28-empty-keybindings.patch')
-rw-r--r--metacity-2.28-empty-keybindings.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/metacity-2.28-empty-keybindings.patch b/metacity-2.28-empty-keybindings.patch
index b2ae51b..3fbaac7 100644
--- a/metacity-2.28-empty-keybindings.patch
+++ b/metacity-2.28-empty-keybindings.patch
@@ -17,23 +17,23 @@ diff --git a/src/ui/ui.c b/src/ui/ui.c
index 78aa353..ef9fcfc 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
-@@ -954,7 +954,7 @@ meta_ui_parse_accelerator (const char *accel,
+@@ -827,7 +827,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);
-@@ -1041,7 +1041,7 @@ meta_ui_parse_modifier (const char *accel,
-
+@@ -914,7 +914,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);
--
1.7.9