discomfitor pushed a commit to branch master.
commit 2c1390e7c822a946e3d18727a39677c1cb4806ff
Author: Mike Blumenkrantz <[email protected]>
Date: Mon Aug 19 10:31:25 2013 +0100
fix binding upgrades from e17
---
src/bin/e_config.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index eed7b74..90c6290 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1062,7 +1062,8 @@ e_config_load(void)
#define CONFIG_VERSION_UPDATE_INFO(VERSION) \
INF("Performing config upgrade for %d.%d", E_CONFIG_FILE_EPOCH, VERSION);
- CONFIG_VERSION_CHECK(6)
+ /* this should be 6, an xkb fix fucked up the ordering and this is now
really broken */
+ CONFIG_VERSION_CHECK(8)
{
/* e_bindings config domain didn't exist before this version, so we
have to do this
* check before we load or else we wipe configs :(
@@ -1070,7 +1071,7 @@ e_config_load(void)
#undef SET
#define SET(X) e_bindings->X = e_config->X, e_config->X = NULL
- CONFIG_VERSION_UPDATE_INFO(6);
+ //CONFIG_VERSION_UPDATE_INFO(6);
if (e_config->mouse_bindings || e_config->key_bindings ||
e_config->edge_bindings ||
e_config->signal_bindings || e_config->wheel_bindings ||
e_config->acpi_bindings)
{
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
