forked from enlightenment/enlightenment
fix e icon setting of fdo icon if fdo icon ends up being an edje file.
SVN revision: 55964
This commit is contained in:
parent
7396fa5d00
commit
7b9c5b9a74
|
@ -154,7 +154,8 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
|
||||||
{
|
{
|
||||||
E_Smart_Data *sd;
|
E_Smart_Data *sd;
|
||||||
const char *path;
|
const char *path;
|
||||||
|
int len;
|
||||||
|
|
||||||
if (!icon) return EINA_TRUE;
|
if (!icon) return EINA_TRUE;
|
||||||
if (icon[0] == '/') return e_icon_file_set(obj, icon);
|
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);
|
path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
|
||||||
if (!path) return EINA_TRUE;
|
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 */
|
/* smart code here */
|
||||||
_e_icon_obj_prepare(obj, sd);
|
_e_icon_obj_prepare(obj, sd);
|
||||||
sd->loading = 0;
|
sd->loading = 0;
|
||||||
|
|
Loading…
Reference in New Issue