fix another binding upgrade bug

SVN revision: 83656
This commit is contained in:
Mike Blumenkrantz 2013-02-06 07:49:45 +00:00
parent 6dd0e7eb67
commit f76af85149
1 changed files with 13 additions and 7 deletions

View File

@ -1169,14 +1169,20 @@ e_config_load(void)
#define SET(X) e_bindings->X = e_config->X, e_config->X = NULL
CONFIG_VERSION_UPDATE_INFO(6);
SET(mouse_bindings);
SET(key_bindings);
SET(edge_bindings);
SET(signal_bindings);
SET(wheel_bindings);
SET(acpi_bindings);
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)
{
SET(mouse_bindings);
SET(key_bindings);
SET(edge_bindings);
SET(signal_bindings);
SET(wheel_bindings);
SET(acpi_bindings);
e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
#undef SET
e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
}
else
e_bindings = e_config_domain_load("e_bindings", _e_config_binding_edd);
}
else
e_bindings = e_config_domain_load("e_bindings", _e_config_binding_edd);