enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix e icon setting of fdo icon if fdo icon ends up being an edje file. 

SVN revision: 55964
This commit is contained in:
Carsten Haitzler 2011-01-07 04:31:47 +00:00
parent 7396fa5d00
commit 7b9c5b9a74
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_icon.c
View File

@ -154,7 +154,8 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
{
E_Smart_Data *sd;
const char *path;
int len;
if (!icon) return EINA_TRUE;
if (icon[0] == '/') return e_icon_file_set(obj, icon);
@ -166,6 +167,10 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
if (!path) return EINA_TRUE;
len = strlen(icon);
if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
return e_icon_file_edje_set(obj, path, "icon");
/* smart code here */
_e_icon_obj_prepare(obj, sd);
sd->loading = 0;