[elm_softkey.c] Added code to make sure that the signal for clicked is called only...
authorRajeev Ranjan <rajeev.r@samsung.com>
Fri, 23 Jul 2010 11:08:20 +0000 (16:38 +0530)
committerRajeev Ranjan <rajeev.r@samsung.com>
Fri, 23 Jul 2010 11:08:20 +0000 (16:38 +0530)
src/lib/elm_softkey.c

index 67830f5..9252ae3 100644 (file)
@@ -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