diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/edje/src/lib/edje_cache.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/edje/src/lib/edje_cache.c')
-rw-r--r-- | libraries/edje/src/lib/edje_cache.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libraries/edje/src/lib/edje_cache.c b/libraries/edje/src/lib/edje_cache.c index a8b355f..0ce6b30 100644 --- a/libraries/edje/src/lib/edje_cache.c +++ b/libraries/edje/src/lib/edje_cache.c | |||
@@ -128,18 +128,11 @@ _edje_file_coll_open(Edje_File *edf, const char *coll) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | static Edje_File * | 130 | static Edje_File * |
131 | _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret) | 131 | _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime) |
132 | { | 132 | { |
133 | Edje_File *edf; | 133 | Edje_File *edf; |
134 | Edje_Part_Collection *edc; | 134 | Edje_Part_Collection *edc; |
135 | Eet_File *ef; | 135 | Eet_File *ef; |
136 | struct stat st; | ||
137 | |||
138 | if (stat(file, &st) != 0) | ||
139 | { | ||
140 | *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST; | ||
141 | return NULL; | ||
142 | } | ||
143 | 136 | ||
144 | ef = eet_open(file, EET_FILE_MODE_READ); | 137 | ef = eet_open(file, EET_FILE_MODE_READ); |
145 | if (!ef) | 138 | if (!ef) |
@@ -156,7 +149,7 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co | |||
156 | } | 149 | } |
157 | 150 | ||
158 | edf->ef = ef; | 151 | edf->ef = ef; |
159 | edf->mtime = st.st_mtime; | 152 | edf->mtime = mtime; |
160 | 153 | ||
161 | if (edf->version != EDJE_FILE_VERSION) | 154 | if (edf->version != EDJE_FILE_VERSION) |
162 | { | 155 | { |
@@ -262,7 +255,7 @@ open_new: | |||
262 | if (!_edje_file_hash) | 255 | if (!_edje_file_hash) |
263 | _edje_file_hash = eina_hash_string_small_new(NULL); | 256 | _edje_file_hash = eina_hash_string_small_new(NULL); |
264 | 257 | ||
265 | edf = _edje_file_open(file, coll, error_ret, edc_ret); | 258 | edf = _edje_file_open(file, coll, error_ret, edc_ret, st.st_mtime); |
266 | if (!edf) | 259 | if (!edf) |
267 | return NULL; | 260 | return NULL; |
268 | 261 | ||