discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fef794108316a00775ab7aee8323b2e2677210d2
commit fef794108316a00775ab7aee8323b2e2677210d2 Author: Mike Blumenkrantz <[email protected]> Date: Fri Aug 25 14:47:05 2017 -0400 set elm profile to match e profile during startup this is actually broken, as is entire the concept of using mixed e+elm configs. if a user manually changes the profile, e.g., for a single app, then this will overwrite the global profile name. similarly, setting the profile in this manner overwrites the global profile, causing all existing apps to switch to that profile --- src/bin/e_config.c | 9 +++++++++ src/bin/e_config.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index dd375c5a7..5b7d9ddb0 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -874,6 +874,7 @@ e_config_init(void) if (!getenv("E_CONF_PROFILE")) e_util_env_set("E_CONF_PROFILE", _e_config_profile); } + e_util_env_set("ELM_PROFILE", _e_config_profile); _e_config_bindings_mouse_edd = E_CONFIG_DD_NEW("E_Config_Binding_Mouse", E_Config_Binding_Mouse); @@ -1497,7 +1498,15 @@ e_config_load(void) e_config->modules = eina_list_append(e_config->modules, module); } } + CONFIG_VERSION_CHECK(24) + { + CONFIG_VERSION_UPDATE_INFO(24); + + if (!elm_config_profile_exists(_e_config_profile)) + elm_config_profile_save(_e_config_profile); + } } + elm_config_profile_set(_e_config_profile); if (!e_config->remember_internal_fm_windows) e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index bfd1dabba..3ed61b004 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -46,7 +46,7 @@ typedef enum /* increment this whenever a new set of config values are added but the users * config doesn't need to be wiped - simply new values need to be put in */ -#define E_CONFIG_FILE_GENERATION 23 +#define E_CONFIG_FILE_GENERATION 24 #define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) #define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! --
