enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Set load errors in more cases. 

SVN revision: 17617
This commit is contained in:
rbdpngn 2005-10-16 20:36:20 +00:00 committed by rbdpngn
parent f7b38107de
commit ccc8f7236f
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/edje/src/lib/Edje.h
View File

@ -130,7 +130,8 @@ enum
EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED = 4,
EDJE_LOAD_ERROR_CORRUPT_FILE = 5,
EDJE_LOAD_ERROR_UNKNOWN_FORMAT = 6,
EDJE_LOAD_ERROR_INCOMPATIBLE_FILE = 7
EDJE_LOAD_ERROR_INCOMPATIBLE_FILE = 7,
EDJE_LOAD_ERROR_UNKNOWN_COLLECTION = 8
};
#ifdef __cplusplus

10
legacy/edje/src/lib/edje_cache.c
View File

@ -110,8 +110,12 @@ _edje_file_open(char *file, char *coll, int *error_ret, Edje_Part_Collection **e
}
edc = _edje_file_coll_open(edf, ef, coll);
if (!edc)
{
*error_ret = EDJE_LOAD_ERROR_UNKNOWN_COLLECTION;
}
if (edc_ret) *edc_ret = edc;
eet_close(ef);
return edf;
}
@ -176,6 +180,10 @@ _edje_cache_file_coll_open(char *file, char *coll, int *error_ret, Edje_Part_Col
if (!edc)
{
edc = _edje_file_coll_open(edf, NULL, coll);
if (!edc)
{
*error_ret = EDJE_LOAD_ERROR_UNKNOWN_COLLECTION;
}
}
if (edc_ret) *edc_ret = edc;

6
legacy/edje/src/lib/edje_load.c
View File

@ -134,7 +134,11 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
ep = l->data;
rp = calloc(1, sizeof(Edje_Real_Part));
if (!rp) return 0;
if (!rp)
{
ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
return 0;
}
rp->part = ep;
ed->parts = evas_list_append(ed->parts, rp);
rp->param1.description = ep->default_desc;