restore default keybindings no longer restores two bindings for ctrl+alt+f

FEAR NOT MORLENXUS, YOUR BUG FIX IS HERE

SVN revision: 82337

diff --git a/ChangeLog b/ChangeLog
index efda884..1204191 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-01-07 Mike Blumenkrantz
 
         * Added option for disabling icons in menus
+        * Restore default keybindings no longer restores two bindings for ctrl+alt+f
 
 2013-01-07 Thomas Petazzoni
 

diff --git a/NEWS b/NEWS
index 5a1932a..53f06ac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -59,3 +59,4 @@ Fixes:
       E to ignore activate hints
     * Fix restarting E17 after manually monitoring it.
     * Fix build with uClibc.
+    * Restore default keybindings no longer restores two bindings for ctrl+alt+f

diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index bb9dc9f..0ba50c9 100644 (file)
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -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");