From 62ae68b3448c74cf4b26dcfff7ca845b60c5c455 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 4 Feb 2013 12:12:12 +0000 Subject: [PATCH] move around init for e_bindings a little to handle case of people eventually updating from E17->E18 SVN revision: 83596 --- src/bin/e_config.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 2766df1c3..166ff3a5d 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1166,6 +1166,21 @@ e_config_load(void) "As a result, all bindings have been reloaded from defaults.
" "Sorry for the inconvenience.
")); } + else if (!e_bindings) + { + e_bindings = E_NEW(E_Config_Bindings, 1); +#undef SET +#define SET(X) e_bindings->X = e_config->X, e_config->X = NULL + + SET(mouse_bindings); + SET(key_bindings); + SET(edge_bindings); + SET(signal_bindings); + SET(wheel_bindings); + SET(acpi_bindings); +#undef SET + e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings); + } if (e_config->config_version < E_CONFIG_FILE_VERSION) { @@ -1198,6 +1213,7 @@ e_config_load(void) } } } +/* this gets done above but I'm leaving it here so it can be seen CONFIG_VERSION_CHECK(6) { CONFIG_VERSION_UPDATE_INFO(6); @@ -1214,6 +1230,7 @@ e_config_load(void) #undef SET e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings); } +*/ CONFIG_VERSION_CHECK(8) { CONFIG_VERSION_UPDATE_INFO(8);