From bbc04f963b9b35f39a3d18936f2bf6f920c83914 Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Mon, 12 Jul 2010 16:45:32 +0900 Subject: [PATCH] [elm_softkey.c] Not removing the signal raising code yet however will need to remove this as callback is sufficient. --- src/lib/elm_softkey.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/lib/elm_softkey.c b/src/lib/elm_softkey.c index b50a256..b373629 100644 --- a/src/lib/elm_softkey.c +++ b/src/lib/elm_softkey.c @@ -526,17 +526,16 @@ static void _softkey_up_cb(void *data, Evas_Object *obj, const char *emission, c Elm_Softkey_Item *it = (Elm_Softkey_Item *) data; elm_softkey_panel_close(it->obj); - evas_object_smart_callback_call(it->obj, "clicked", it); - if (it->icon) { - edj = elm_layout_edje_get(it->icon); - if (!edj) - return; - edje_object_signal_emit(edj, "elm,state,unselected", "elm"); + edj = elm_layout_edje_get(it->icon); + if (!edj) + return; + edje_object_signal_emit(edj, "elm,state,unselected", "elm"); } if (it->func) - it->func((void *) (it->data), it->obj, it); + it->func((void *) (it->data), it->obj, it); + evas_object_smart_callback_call(it->obj, "clicked", it); } static void _softkey_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source) @@ -570,9 +569,9 @@ static void _panel_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info } elm_softkey_panel_close(it->obj); - evas_object_smart_callback_call(it->obj, "clicked", it); if (it->func) it->func((void *) (it->data), it->obj, it); + evas_object_smart_callback_call(it->obj, "clicked", it); } static void _panel_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -- 2.7.4