summaryrefslogtreecommitdiff
path: root/src/lib
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 /src/lib
parent5f207d79e352ee4356c849311a721b212834ea26 (diff)
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...
Diffstat (limited to 'src/lib')
-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)
1459 } 1459 }
1460 } 1460 }
1461 1461
1462 if(!_use_build_config) 1462 for (i = 0; i < 2 && !_use_build_config; i++)
1463 { 1463 {
1464 _elm_config_user_dir_snprintf(buf, sizeof(buf), "config/profile.cfg"); 1464 // user profile
1465 if (i == 0)
1466 _elm_config_user_dir_snprintf(buf, sizeof(buf), "config/profile.cfg");
1467 // system profile
1468 else if (i == 1)
1469 _elm_data_dir_snprintf(buf, sizeof(buf), "config/profile.cfg");
1465 ef = eet_open(buf, EET_FILE_MODE_READ); 1470 ef = eet_open(buf, EET_FILE_MODE_READ);
1466 if (ef) 1471 if (ef)
1467 { 1472 {