From dd6ec8ed028c2cdb1171d6393bf40f24cace3ca0 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 26 Jul 2009 17:01:42 +0000 Subject: [PATCH] fix #217: enlightenment_start -profile blocks further profile changes. We should just set E_CONF_PROFILE from command line option or e_config startup if we did not had this set before. This is because ecore_app_restart() will use the same parameters and profile will be there yet. SVN revision: 41500 --- src/bin/e_config.c | 3 ++- src/bin/e_main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 17a553097..c0ee7cea7 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -121,7 +121,8 @@ e_config_init(void) else _e_config_profile = strdup("default"); } - e_util_env_set("E_CONF_PROFILE", _e_config_profile); + if (!getenv("E_CONF_PROFILE")) + e_util_env_set("E_CONF_PROFILE", _e_config_profile); } _e_config_gadcon_client_edd = E_CONFIG_DD_NEW("E_Config_Gadcon_Client", E_Config_Gadcon_Client); diff --git a/src/bin/e_main.c b/src/bin/e_main.c index e0314993d..69b16448d 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -302,7 +302,8 @@ main(int argc, char **argv) else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1))) { i++; - e_util_env_set("E_CONF_PROFILE", argv[i]); + if (!getenv("E_CONF_PROFILE")) + e_util_env_set("E_CONF_PROFILE", argv[i]); } else if (!strcmp(argv[i], "-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it")) {