summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-02-20 12:10:18 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-02-20 12:15:00 +0900
commit61287fce389843c8cb1819556da08ec98241ca13 (patch)
tree4d8efaad171853411af2088407d7e2c053a086db
parent9654db3b16a9339b42008d96c7bad06784f5c7ba (diff)
edje: let's properly report that file doesn't exist.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS1
-rw-r--r--src/lib/edje/edje_cache.c5
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1aad83f212..8e8251947b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
12013-02-19 Daniel Zaoui 12013-02-20 Cedric Bail
2
3 * Properly report file not found in Edje.
4
52013-02-19 Daniel Zaoui
2 6
3 * Fix Evas_Object_Text when LTR and RTL are used in the same paragraph. 7 * Fix Evas_Object_Text when LTR and RTL are used in the same paragraph.
4 8
diff --git a/NEWS b/NEWS
index dc576ff4f9..8fa05e627a 100644
--- a/NEWS
+++ b/NEWS
@@ -174,3 +174,4 @@ Fixes:
174 * fix anchor clicked mouse signals for selection-enabled entries 174 * fix anchor clicked mouse signals for selection-enabled entries
175 * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes. 175 * Fix edje_color_class_list() and edje_text_class_list() to look at right hashes.
176 * Evas: Fix Evas_Object_Text when LTR and RTL are used in the same paragraph. 176 * Evas: Fix Evas_Object_Text when LTR and RTL are used in the same paragraph.
177 * Properly report file not found in Edje.
diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c
index 3f93e5cd73..7e5506fba5 100644
--- a/src/lib/edje/edje_cache.c
+++ b/src/lib/edje/edje_cache.c
@@ -403,7 +403,10 @@ _edje_cache_file_coll_open(const char *file, const char *coll, int *error_ret, E
403 struct stat st; 403 struct stat st;
404 404
405 if (stat(file, &st) != 0) 405 if (stat(file, &st) != 0)
406 return NULL; 406 {
407 *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST;
408 return NULL;
409 }
407 410
408 if (!_edje_file_hash) 411 if (!_edje_file_hash)
409 { 412 {