Edje: Remove Efreet dependency.devs/iscaro/edje-deps

Edje was using Efreet only to fetch the user's cache dir,
but this can be easily done with efl_vpath and as a plus
Edje no longer depends on Efreet.

4 files changed, 12 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index 2f398c7ca3..315f1b6517 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4769,7 +4769,6 @@ EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
-EFL_INTERNAL_DEPEND_PKG([EDJE], [efreet])
 
 if test "x${want_physics}" = "xyes" ; then
   AC_DEFINE([HAVE_EPHYSICS], [1], [EPhysics Support])
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 3a0b8fd36a..f55c331bf8 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -66,7 +66,7 @@ _edje_extract_mo_files(Edje *ed)
    unsigned int i;
    int len;
 
-   cache_path = efreet_cache_home_get();
+   cache_path = _edje_cache_dir_get();
 
    t = eina_file_mtime_get(ed->file->f);
    sz = eina_file_size_get(ed->file->f);
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index 21d609ecd9..04be6b2667 100644
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -1,4 +1,5 @@
 #include "edje_private.h"
+#include <Efl.h>
 
 static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV };
 EAPI Edje_Version * edje_version = &_version;
@@ -25,6 +26,13 @@ static const Edje_Calc_Params_Physics default_calc_physics = {
 static void _edje_ephysics_clear(void);
 #endif
 
+const char *
+_edje_cache_dir_get(void)
+{
+   Efl_Vpath_Core *core = efl_vpath_core_get(EFL_VPATH_CORE_CLASS);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(core, NULL);
+   return efl_vpath_core_meta_get(core, "cache");
+}
 
 /*============================================================================*
 *                                   API                                      *
@@ -74,12 +82,6 @@ edje_init(void)
         goto shutdown_eet;
      }
 
-   if (!efreet_init())
-     {
-        ERR("Efreet init failed");
-        goto shutdown_evas;
-     }
-
    _edje_scale = FROM_DOUBLE(1.0);
 
    _edje_edd_init();
@@ -116,7 +118,7 @@ edje_init(void)
    _edje_language = eina_stringshare_add(getenv("LANGUAGE"));
 
    str = eina_strbuf_new();
-   eina_strbuf_append_printf(str, "%s/edje", efreet_cache_home_get());
+   eina_strbuf_append_printf(str, "%s/edje", _edje_cache_dir_get());
    _edje_cache_path = eina_stringshare_add(eina_strbuf_string_get(str));
    eina_strbuf_free(str);
 
@@ -140,8 +142,6 @@ shutdown_all:
    _edje_text_class_hash_free();
    _edje_size_class_hash_free();
    _edje_edd_shutdown();
-   efreet_shutdown();
-shutdown_evas:
    evas_shutdown();
 shutdown_eet:
    eet_shutdown();
@@ -207,7 +207,6 @@ _edje_shutdown_core(void)
    _edje_ephysics_clear();
 #endif
 
-   efreet_shutdown();
    ecore_shutdown();
    evas_shutdown();
    eet_shutdown();
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 551c337b6b..6cdad9f6d0 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -54,7 +54,6 @@
 # include <Ecore_IMF_Evas.h>
 #endif
 #include <Embryo.h>
-#include <Efreet.h>
 
 #ifdef HAVE_EPHYSICS
 # include <EPhysics.h>
@@ -2664,6 +2663,8 @@ EAPI void edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce);
 EAPI void edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce);
 EAPI void _edje_cache_file_unref(Edje_File *edf);
 
+const char *_edje_cache_dir_get(void);
+
 void _edje_embryo_globals_init(Edje *ed);
 
 #define CHKPARAM(n) if (params[0] != (sizeof(Embryo_Cell) * (n))) return -1;