Bug#598015: metacity, parsing keybindins, accept "" as disabled

[Maximiliano Curia]

tag 598015 +patch
thanks

Hi,

I've prepared a patch for this issue. The expected string for a disabled
keybinding is "disabled", but gnome-keybinding-properties used to put an empty
string instead.

I decided to patch metacity as the changes made by gnome-keybinding-properties
are going to be around even after the user has migrated to gnome 3.

Thanks,
-- 
"The sooner you start to code, the longer the program will take." -- Roy Carlson
Saludos /\/\ /\ >< `/
-------------- next part --------------
Index: metacity-2.34.1/src/ui/ui.c
===================================================================
--- metacity-2.34.1.orig/src/ui/ui.c	2011-03-08 06:31:53.000000000 -0300
+++ metacity-2.34.1/src/ui/ui.c	2012-01-29 14:34:22.350778514 -0300
@@ -958,7 +958,7 @@
   *keycode = 0;
   *mask = 0;
 
-  if (strcmp (accel, "disabled") == 0)
+  if ((strcmp (accel, "disabled") == 0) || (strcmp (accel, "") == 0))
     return TRUE;
   
   meta_ui_accelerator_parse (accel, &gdk_sym, &gdk_code, &gdk_mask);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20120129/f2590185/attachment.pgp>