aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-15 20:42:18 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-15 20:43:18 +0000
commitfe6ea2314c30be8b6c7e7339fe4cd36d30f25ef2 (patch)
treec0c12d20471e8301df094b7ce741303ad3e58aba
parentfocus_manager: fix memory leaks (diff)
downloadefl-fe6ea2314c30be8b6c7e7339fe4cd36d30f25ef2.tar.gz
Revert "elm_config: remove profile name reading logic from data dir"
This reverts commit 6c4e49d970ca6046780ba1b9fb226f465d14a497. Hell no - this removes loading of system config profile. the entire premise of the patch is wrong. it isn't reading the code at all... how this got through review is rather amazing...
-rw-r--r--src/lib/elementary/elm_config.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index ac8d5d10b6..119d75776d 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1459,9 +1459,14 @@ _profile_fetch_from_conf(void)
}
}
- if(!_use_build_config)
+ for (i = 0; i < 2 && !_use_build_config; i++)
{
- _elm_config_user_dir_snprintf(buf, sizeof(buf), "config/profile.cfg");
+ // user profile
+ if (i == 0)
+ _elm_config_user_dir_snprintf(buf, sizeof(buf), "config/profile.cfg");
+ // system profile
+ else if (i == 1)
+ _elm_data_dir_snprintf(buf, sizeof(buf), "config/profile.cfg");
ef = eet_open(buf, EET_FILE_MODE_READ);
if (ef)
{