summaryrefslogtreecommitdiff
path: root/src/edje_externals/elm.c
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-07-10 21:56:02 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-07-10 21:56:02 +0000
commit5793fe4fae8dac3bdd2a9d4f713605269c73f1e8 (patch)
tree05b6d5ba92a543df6fe841da6507b3df4bbd93e9 /src/edje_externals/elm.c
parent586964879f0e8f49094da93d13412479851da404 (diff)
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
Diffstat (limited to 'src/edje_externals/elm.c')
-rw-r--r--src/edje_externals/elm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index e7b75cc1b..7ec06b6fe 100644
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -57,7 +57,7 @@ external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const
57 57
58 if ((*p=='\0') || (*(p+1)!=':')) 58 if ((*p=='\0') || (*(p+1)!=':'))
59 { 59 {
60 ERR("Invalid External Signal received: '%s' '%s'\n", sig, source); 60 ERR("Invalid External Signal received: '%s' '%s'", sig, source);
61 free(_signal); 61 free(_signal);
62 return ; 62 return ;
63 } 63 }
@@ -245,11 +245,13 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p)
245 parent_widget = edje; 245 parent_widget = edje;
246 icon = elm_icon_add(parent_widget); 246 icon = elm_icon_add(parent_widget);
247 247
248 if (elm_image_file_set(icon, file, p->s)) 248 if ((edje_file_group_exists(file, p->s)) &&
249 (elm_image_file_set(icon, file, p->s)))
249 return icon; 250 return icon;
250 if (elm_icon_standard_set(icon, p->s)) 251 if (elm_icon_standard_set(icon, p->s))
251 return icon; 252 return icon;
252 253
254 ERR("Failed to set icon: '%s'", p->s);
253 evas_object_del(icon); 255 evas_object_del(icon);
254 return NULL; 256 return NULL;
255} 257}