backport keybinding commit

SVN revision: 82338
This commit is contained in:
Mike Blumenkrantz 2013-01-07 11:12:17 +00:00
parent bef2c4bf30
commit 45aecae167
3 changed files with 5 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2013-01-07 Mike Blumenkrantz
* Restore default keybindings no longer restores two bindings for ctrl+alt+f
2013-01-07 Thomas Petazzoni
* Fix build with uClibc.

1
NEWS
View File

@ -17,3 +17,4 @@ Fixes:
* Fix construction of variant list for setxkbmap
* Fix E17 restart after manually monitoring it
* Fix build with uClibc
* Restore default keybindings no longer restores two bindings for ctrl+alt+f

View File

@ -528,9 +528,6 @@ _restore_key_binding_defaults_cb(void *data,
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "i",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_iconic_toggle", NULL);
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "f",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"window_maximized_toggle", NULL);
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "F10",
E_BINDING_MODIFIER_SHIFT, 0,
"window_maximized_toggle", "default vertical");