forked from enlightenment/efl
Remove unused variable and don't create icons if there's no icon set
SVN revision: 45564
This commit is contained in:
parent
66d310cf5b
commit
6f6ebbfaa6
|
@ -35,7 +35,7 @@ external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Ein
|
||||||
Edje_External_Param *p;
|
Edje_External_Param *p;
|
||||||
|
|
||||||
p = edje_external_param_find(params, "icon");
|
p = edje_external_param_find(params, "icon");
|
||||||
if (p)
|
if (p && p->s)
|
||||||
{
|
{
|
||||||
Evas_Object *parent = evas_object_smart_parent_get(obj);
|
Evas_Object *parent = evas_object_smart_parent_get(obj);
|
||||||
const char *file;
|
const char *file;
|
||||||
|
@ -48,8 +48,8 @@ external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Ein
|
||||||
return;
|
return;
|
||||||
|
|
||||||
evas_object_del(*icon);
|
evas_object_del(*icon);
|
||||||
*icon = NULL;
|
|
||||||
}
|
}
|
||||||
|
*icon = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -29,7 +29,6 @@ static void *
|
||||||
external_button_params_parse(void *data, Evas_Object *obj, const Eina_List *params)
|
external_button_params_parse(void *data, Evas_Object *obj, const Eina_List *params)
|
||||||
{
|
{
|
||||||
Elm_Params_Button *mem;
|
Elm_Params_Button *mem;
|
||||||
Edje_External_Param *param;
|
|
||||||
|
|
||||||
mem = external_common_params_parse(Elm_Params_Button, data, obj, params);
|
mem = external_common_params_parse(Elm_Params_Button, data, obj, params);
|
||||||
if (!mem)
|
if (!mem)
|
||||||
|
|
Loading…
Reference in New Issue