ajwillia-ms pushed a commit to branch efl-1.14. http://git.enlightenment.org/tools/edi.git/commit/?id=b6f9dea31d635bdfb9ce386eef6b68732f90daa3
commit b6f9dea31d635bdfb9ce386eef6b68732f90daa3 Author: Andy Williams <a...@andywilliams.me> Date: Mon Jun 1 00:02:33 2015 +0100 Revert "Use portable eina util methods for paths." This reverts commit c216a32791acf595f7a7f65d647e601e2c75d59a. --- configure.ac | 2 +- src/bin/screens/edi_welcome.c | 2 +- src/lib/edi_create.c | 2 +- src/tests/edi_suite.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7740ead..bd22dd9 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) PKG_CHECK_MODULES([EFL], [ - eina >= 1.14.99 + eina >= 1.8.0 evas >= 1.8.0 ecore >= 1.8.0 edje >= 1.8.0 diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c index 8a5664c..fd3b945 100644 --- a/src/bin/screens/edi_welcome.c +++ b/src/bin/screens/edi_welcome.c @@ -139,7 +139,7 @@ _edi_welcome_project_choose_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU elm_fileselector_expandable_set(fs, EINA_TRUE); elm_fileselector_folder_only_set(fs, EINA_TRUE); - elm_fileselector_path_set(fs, eina_environment_home_get()); + elm_fileselector_path_set(fs, getenv("HOME")); elm_fileselector_sort_method_set(fs, ELM_FILESELECTOR_SORT_BY_FILENAME_ASC); evas_object_resize(win, 380 * elm_config_scale_get(), 260 * elm_config_scale_get()); diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c index 114d089..ae33d34 100644 --- a/src/lib/edi_create.c +++ b/src/lib/edi_create.c @@ -255,7 +255,7 @@ edi_create_efl_project(const char *parentdir, const char *name, const char *url, source = PACKAGE_DATA_DIR "/skeleton/eflproject.tar.gz"; extract = "tar zxf %s -C %s"; - snprintf(tmp, sizeof(tmp), "%s/edi_%s", eina_environment_tmp_get(), name); + snprintf(tmp, sizeof(tmp), "/tmp/edi_%s", name); snprintf(dest, sizeof(dest), "%s/%s", parentdir, name); INF("Creating project \"%s\" at path %s for %s<%s>\n", name, dest, user, email); diff --git a/src/tests/edi_suite.c b/src/tests/edi_suite.c index 480a913..038cad7 100644 --- a/src/tests/edi_suite.c +++ b/src/tests/edi_suite.c @@ -24,7 +24,7 @@ START_TEST(edi_initialization) fail_if(edi_init() != 1); - path = eina_environment_tmp_get(); + path = "/tmp"; edi_project_set(path); ck_assert_str_eq(edi_project_get(), path); --