rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue gustavo found with enbv vars not overriding x props. 

SVN revision: 75451
This commit is contained in:
Carsten Haitzler 2012-08-20 07:53:39 +00:00
parent 3894dcf37f
commit e0552bb3eb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/elementary/src/lib/elm_config.c
View File

@ -160,6 +160,7 @@ _prop_config_get(void)
_config_free();
_elm_config = config_data;
_env_get();
_config_apply();
_elm_config_font_overlay_apply();
_elm_rescale();
@ -196,11 +197,14 @@ _prop_change_delay_cb(void *data __UNUSED__)
{
char *s;
s = ecore_x_window_prop_string_get(_root_1st, _atom[ATOM_E_PROFILE]);
if (s)
if (!getenv("ELM_PROFILE"))
{
if (_elm_profile) free(_elm_profile);
_elm_profile = s;
s = ecore_x_window_prop_string_get(_root_1st, _atom[ATOM_E_PROFILE]);
if (s)
{
if (_elm_profile) free(_elm_profile);
_elm_profile = s;
}
}
_prop_config_get();
_prop_change_delay_timer = NULL;