hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm_icon_external: cleanup ERR msg in error case 

Summary:
Setting the group without checking it exists causes a errormessage, this
is pretty annoying for people which want to set a standart icon. And
give a better errormessage if the standart setting failed.

Reviewers: raster, cedric

Reviewed By: cedric

Differential Revision: https://phab.enlightenment.org/D2686

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Marcel Hollerbach 2015-06-17 14:53:37 +02:00 committed by Cedric BAIL
parent 6d03b2af7e
commit b592c6df35
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
legacy/elementary/src/edje_externals/elm_icon.c
View File

@ -84,8 +84,16 @@ external_icon_state_set(void *data EINA_UNUSED, Evas_Object *obj,
edje = evas_object_smart_parent_get(obj);
edje_object_file_get(edje, &file, NULL);
if (!elm_image_file_set(obj, file, p->icon))
elm_icon_standard_set(obj, p->icon);
if (!edje_file_group_exists(file, p->icon))
{
if (!elm_icon_standard_set(obj, p->icon))
ERR("Failed to set standard icon! (%s)", p->icon);
}
else if (!elm_image_file_set(obj, file, p->icon))
{
if (!elm_icon_standard_set(obj, p->icon))
ERR("Failed to set standard icon! (%s)", p->icon);
}
}
}
@ -153,8 +161,16 @@ external_icon_param_set(void *data EINA_UNUSED, Evas_Object *obj,
edje = evas_object_smart_parent_get(obj);
edje_object_file_get(edje, &file, NULL);
if (!elm_image_file_set(obj, file, param->s))
elm_icon_standard_set(obj, param->s);
if (!edje_file_group_exists(file, param->s))
{
if (!elm_icon_standard_set(obj, param->s))
ERR("Failed to set standard icon! (%s)", param->s);
}
else if (!elm_image_file_set(obj, file, param->s))
{
if (!elm_icon_standard_set(obj, param->s))
ERR("Failed to set standard icon as fallback! (%s)", param->s);
}
return EINA_TRUE;
}
}