From 9df7ba324548c678f5117625d937695cd60cac32 Mon Sep 17 00:00:00 2001 From: Rajeev Ranjan Date: Fri, 23 Jul 2010 16:38:20 +0530 Subject: [PATCH] [elm_softkey.c] Added code to make sure that the signal for clicked is called only if there is no callback registered for the softkey item clicked. --- src/lib/elm_softkey.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_softkey.c b/src/lib/elm_softkey.c index 67830f5..9252ae3 100644 --- a/src/lib/elm_softkey.c +++ b/src/lib/elm_softkey.c @@ -604,8 +604,10 @@ _softkey_up_cb(void *data, Evas_Object *obj, const char *emission, if (!edj) return; edje_object_signal_emit(edj, "elm,state,unselected", "elm"); } - if (it->func) it->func((void *) (it->data), it->obj, it); - evas_object_smart_callback_call(it->obj, "clicked", it); + if (it->func) + it->func((void *) (it->data), it->obj, it); + else + evas_object_smart_callback_call(it->obj, "clicked", it); } static void @@ -640,8 +642,10 @@ _panel_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } elm_softkey_panel_close(it->obj); - if (it->func) it->func((void *) (it->data), it->obj, it); - evas_object_smart_callback_call(it->obj, "clicked", it); + if (it->func) + it->func((void *) (it->data), it->obj, it); + else + evas_object_smart_callback_call(it->obj, "clicked", it); } static void -- 2.7.4