summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac1
-rw-r--r--src/lib/edje/edje_load.c2
-rw-r--r--src/lib/edje/edje_main.c19
-rw-r--r--src/lib/edje/edje_private.h3
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])
4769EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas]) 4769EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
4770EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo]) 4770EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
4771EFL_INTERNAL_DEPEND_PKG([EDJE], [emile]) 4771EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
4772EFL_INTERNAL_DEPEND_PKG([EDJE], [efreet])
4773 4772
4774if test "x${want_physics}" = "xyes" ; then 4773if test "x${want_physics}" = "xyes" ; then
4775 AC_DEFINE([HAVE_EPHYSICS], [1], [EPhysics Support]) 4774 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)
66 unsigned int i; 66 unsigned int i;
67 int len; 67 int len;
68 68
69 cache_path = efreet_cache_home_get(); 69 cache_path = _edje_cache_dir_get();
70 70
71 t = eina_file_mtime_get(ed->file->f); 71 t = eina_file_mtime_get(ed->file->f);
72 sz = eina_file_size_get(ed->file->f); 72 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 @@
1#include "edje_private.h" 1#include "edje_private.h"
2#include <Efl.h>
2 3
3static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV }; 4static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV };
4EAPI Edje_Version * edje_version = &_version; 5EAPI Edje_Version * edje_version = &_version;
@@ -25,6 +26,13 @@ static const Edje_Calc_Params_Physics default_calc_physics = {
25static void _edje_ephysics_clear(void); 26static void _edje_ephysics_clear(void);
26#endif 27#endif
27 28
29const char *
30_edje_cache_dir_get(void)
31{
32 Efl_Vpath_Core *core = efl_vpath_core_get(EFL_VPATH_CORE_CLASS);
33 EINA_SAFETY_ON_NULL_RETURN_VAL(core, NULL);
34 return efl_vpath_core_meta_get(core, "cache");
35}
28 36
29/*============================================================================* 37/*============================================================================*
30* API * 38* API *
@@ -74,12 +82,6 @@ edje_init(void)
74 goto shutdown_eet; 82 goto shutdown_eet;
75 } 83 }
76 84
77 if (!efreet_init())
78 {
79 ERR("Efreet init failed");
80 goto shutdown_evas;
81 }
82
83 _edje_scale = FROM_DOUBLE(1.0); 85 _edje_scale = FROM_DOUBLE(1.0);
84 86
85 _edje_edd_init(); 87 _edje_edd_init();
@@ -116,7 +118,7 @@ edje_init(void)
116 _edje_language = eina_stringshare_add(getenv("LANGUAGE")); 118 _edje_language = eina_stringshare_add(getenv("LANGUAGE"));
117 119
118 str = eina_strbuf_new(); 120 str = eina_strbuf_new();
119 eina_strbuf_append_printf(str, "%s/edje", efreet_cache_home_get()); 121 eina_strbuf_append_printf(str, "%s/edje", _edje_cache_dir_get());
120 _edje_cache_path = eina_stringshare_add(eina_strbuf_string_get(str)); 122 _edje_cache_path = eina_stringshare_add(eina_strbuf_string_get(str));
121 eina_strbuf_free(str); 123 eina_strbuf_free(str);
122 124
@@ -140,8 +142,6 @@ shutdown_all:
140 _edje_text_class_hash_free(); 142 _edje_text_class_hash_free();
141 _edje_size_class_hash_free(); 143 _edje_size_class_hash_free();
142 _edje_edd_shutdown(); 144 _edje_edd_shutdown();
143 efreet_shutdown();
144shutdown_evas:
145 evas_shutdown(); 145 evas_shutdown();
146shutdown_eet: 146shutdown_eet:
147 eet_shutdown(); 147 eet_shutdown();
@@ -207,7 +207,6 @@ _edje_shutdown_core(void)
207 _edje_ephysics_clear(); 207 _edje_ephysics_clear();
208#endif 208#endif
209 209
210 efreet_shutdown();
211 ecore_shutdown(); 210 ecore_shutdown();
212 evas_shutdown(); 211 evas_shutdown();
213 eet_shutdown(); 212 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 @@
54# include <Ecore_IMF_Evas.h> 54# include <Ecore_IMF_Evas.h>
55#endif 55#endif
56#include <Embryo.h> 56#include <Embryo.h>
57#include <Efreet.h>
58 57
59#ifdef HAVE_EPHYSICS 58#ifdef HAVE_EPHYSICS
60# include <EPhysics.h> 59# include <EPhysics.h>
@@ -2664,6 +2663,8 @@ EAPI void edje_cache_emp_alloc(Edje_Part_Collection_Directory_Entry *ce);
2664EAPI void edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce); 2663EAPI void edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce);
2665EAPI void _edje_cache_file_unref(Edje_File *edf); 2664EAPI void _edje_cache_file_unref(Edje_File *edf);
2666 2665
2666const char *_edje_cache_dir_get(void);
2667
2667void _edje_embryo_globals_init(Edje *ed); 2668void _edje_embryo_globals_init(Edje *ed);
2668 2669
2669#define CHKPARAM(n) if (params[0] != (sizeof(Embryo_Cell) * (n))) return -1; 2670#define CHKPARAM(n) if (params[0] != (sizeof(Embryo_Cell) * (n))) return -1;