From 0d528c93cab9c5f24e41442956b32aca8d7e523a Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Tue, 10 Jul 2012 21:56:02 +0000 Subject: [PATCH] Elementary: fix external icon set using standard icons Everytime a icon not on edje file is used (an standard icon), an error was printed because it was trying to set it from edje first. Now it checks if the group exists on edje first. SVN revision: 73543 --- legacy/elementary/src/edje_externals/elm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/edje_externals/elm.c b/legacy/elementary/src/edje_externals/elm.c index e7b75cc1bf..7ec06b6fef 100644 --- a/legacy/elementary/src/edje_externals/elm.c +++ b/legacy/elementary/src/edje_externals/elm.c @@ -57,7 +57,7 @@ external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const if ((*p=='\0') || (*(p+1)!=':')) { - ERR("Invalid External Signal received: '%s' '%s'\n", sig, source); + ERR("Invalid External Signal received: '%s' '%s'", sig, source); free(_signal); return ; } @@ -245,11 +245,13 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p) parent_widget = edje; icon = elm_icon_add(parent_widget); - if (elm_image_file_set(icon, file, p->s)) + if ((edje_file_group_exists(file, p->s)) && + (elm_image_file_set(icon, file, p->s))) return icon; if (elm_icon_standard_set(icon, p->s)) return icon; + ERR("Failed to set icon: '%s'", p->s); evas_object_del(icon); return NULL; }