Fix the build error and logic

Change-Id: I9ae0c64e7e229239048f391015aea2c978b27021

diff --git a/src/script_port.c b/src/script_port.c
index 92c9912..b2e2653 100644 (file)
--- a/src/script_port.c
+++ b/src/script_port.c
@@ -902,31 +902,46 @@ PUBLIC int script_feed_event(void *h, Evas *e, int event_type, int x, int y, int
                        ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
                } else if ((event_type & LB_SCRIPT_ACCESS_ACTION) == LB_SCRIPT_ACCESS_ACTION) {
                        if (down == 0) {
-                               action = ELM_ACCESS_ACTION_ACTION_UP;
+                               action = ELM_ACCESS_ACTION_UP;
+                               ret = elm_access_action(edje, action, info);
+                               DbgPrint("ACCESS_ACTION(%d), returns %d\n", down, ret);
+                               ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
                        } else if (down == 1) {
-                               action = ELM_ACCESS_ACTION_ACTION_DOWN;
+                               action = ELM_ACCESS_ACTION_DOWN;
+                               ret = elm_access_action(edje, action, info);
+                               DbgPrint("ACCESS_ACTION(%d), returns %d\n", down, ret);
+                               ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
                        } else {
                                ErrPrint("Invalid access event\n");
-                               break;
+                               ret = LB_ACCESS_STATUS_ERROR;
                        }
-
-                       ret = elm_access_action(edje, action, info);
-                       DbgPrint("ACCESS_ACTION(%d), returns %d\n", down, ret);
-                       ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
                } else if ((event_type & LB_SCRIPT_ACCESS_SCROLL) == LB_SCRIPT_ACCESS_SCROLL) {
                        action = ELM_ACCESS_ACTION_SCROLL;
                        info->x = x;
                        info->y = y;
                        switch (down) {
-                       case 0: info->mouse_type = 0; break;
-                       case -1: info->mouse_type = 1; break;
-                       case 1: info->mouse_type = 2; break;
+                       case 0:
+                               info->mouse_type = 0;
+                               ret = elm_access_action(edje, action, info);
+                               DbgPrint("ACCESS_HIGHLIGHT_SCROLL, returns %d\n", ret);
+                               ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
+                               break;
+                       case -1:
+                               info->mouse_type = 1;
+                               ret = elm_access_action(edje, action, info);
+                               DbgPrint("ACCESS_HIGHLIGHT_SCROLL, returns %d\n", ret);
+                               ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
+                               break;
+                       case 1:
+                               info->mouse_type = 2;
+                               ret = elm_access_action(edje, action, info);
+                               DbgPrint("ACCESS_HIGHLIGHT_SCROLL, returns %d\n", ret);
+                               ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
+                               break;
                        default:
+                               ret = LB_ACCESS_STATUS_ERROR;
                                break;
                        }
-                       ret = elm_access_action(edje, action, info);
-                       DbgPrint("ACCESS_HIGHLIGHT_SCROLL, returns %d\n", ret);
-                       ret = (ret == EINA_FALSE) ? LB_ACCESS_STATUS_ERROR : LB_ACCESS_STATUS_DONE;
                } else if ((event_type & LB_SCRIPT_ACCESS_UNHIGHLIGHT) == LB_SCRIPT_ACCESS_UNHIGHLIGHT) {
                        action = ELM_ACCESS_ACTION_UNHIGHLIGHT;
                        ret = elm_access_action(edje, action, info);