From 5b0718f56a3eeac1f07fa692507a90cf7af9b16f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Iv=C3=A1n=20Briano?= Date: Mon, 25 Jan 2010 19:56:45 +0000 Subject: [PATCH] Remove unused variable and don't create icons if there's no icon set SVN revision: 45564 --- src/edje_externals/elm.c | 4 ++-- src/edje_externals/elm_button.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c index cc26583..df06c61 100644 --- a/src/edje_externals/elm.c +++ b/src/edje_externals/elm.c @@ -35,7 +35,7 @@ external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Ein Edje_External_Param *p; p = edje_external_param_find(params, "icon"); - if (p) + if (p && p->s) { Evas_Object *parent = evas_object_smart_parent_get(obj); const char *file; @@ -48,8 +48,8 @@ external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Ein return; evas_object_del(*icon); - *icon = NULL; } + *icon = NULL; } void diff --git a/src/edje_externals/elm_button.c b/src/edje_externals/elm_button.c index ad3514f..1edacc8 100644 --- a/src/edje_externals/elm_button.c +++ b/src/edje_externals/elm_button.c @@ -29,7 +29,6 @@ static void * external_button_params_parse(void *data, Evas_Object *obj, const Eina_List *params) { Elm_Params_Button *mem; - Edje_External_Param *param; mem = external_common_params_parse(Elm_Params_Button, data, obj, params); if (!mem) -- 2.7.4