remove the duplication of verifying request_notified

Change-Id: I7f3d0f75e757bc36fdb26faef7bea95e5a505f59

diff --git a/src/efl_util.c b/src/efl_util.c
index afd50e1..520e97e 100644 (file)
--- a/src/efl_util.c
+++ b/src/efl_util.c
@@ -2432,6 +2432,20 @@ _efl_util_gesture_convert_error(int ret)
 }
 
 /* LCOV_EXCL_START */
+static efl_util_error_e
+_efl_util_gesture_verify_request_notified()
+{
+   int ret = EFL_UTIL_ERROR_NONE;
+
+   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
+     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
+
+   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
+   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+
+   return ret;
+}
+
 static int
 _efl_util_gesture_grab_edge_swipe(efl_util_gesture_data data, Eina_Bool grabbed)
 {
@@ -2464,11 +2478,7 @@ _efl_util_gesture_grab_edge_swipe(efl_util_gesture_data data, Eina_Bool grabbed)
    else
       tizen_gesture_ungrab_edge_swipe(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -2505,11 +2515,7 @@ _efl_util_gesture_grab_edge_drag(efl_util_gesture_data data, Eina_Bool grabbed)
    else
       tizen_gesture_ungrab_edge_drag(_eflutil_defaultqueue.wl.gesture.proto, fingers, edge, edge_size, start_point, end_point);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -2540,11 +2546,7 @@ _efl_util_gesture_grab_tap(efl_util_gesture_data data, Eina_Bool grabbed)
    else
       tizen_gesture_ungrab_tap(_eflutil_defaultqueue.wl.gesture.proto, fingers, repeats);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -2567,11 +2569,7 @@ _efl_util_gesture_grab_palm_cover(efl_util_gesture_data data, Eina_Bool grabbed)
    else
       tizen_gesture_ungrab_palm_cover(_eflutil_defaultqueue.wl.gesture.proto);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -2986,11 +2984,7 @@ efl_util_gesture_select(efl_util_gesture_h gesture_h, Evas_Object *window, efl_u
 
    tizen_gesture_select_palm_cover(_eflutil_defaultqueue.wl.gesture.proto, surface);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -3022,11 +3016,7 @@ efl_util_gesture_deselect(efl_util_gesture_h gesture_h, Evas_Object *window, efl
 
    tizen_gesture_deselect_palm_cover(_eflutil_defaultqueue.wl.gesture.proto, surface);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -3043,11 +3033,7 @@ efl_util_gesture_activate_set(efl_util_gesture_h gesture_h, unsigned int type, E
 
    tizen_gesture_activate_set(_eflutil_defaultqueue.wl.gesture.proto, NULL, type, active);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }
@@ -3074,11 +3060,7 @@ efl_util_gesture_activate_set_on_window(efl_util_gesture_h gesture_h, Evas_Objec
 
    tizen_gesture_activate_set(_eflutil_defaultqueue.wl.gesture.proto, surface, type, active);
 
-   while (_eflutil_defaultqueue.wl.gesture.request_notified == -1)
-     wl_display_dispatch(_eflutil_defaultqueue.wl.dpy);
-
-   ret = _efl_util_gesture_convert_error(_eflutil_defaultqueue.wl.gesture.request_notified);
-   _eflutil_defaultqueue.wl.gesture.request_notified = -1;
+   ret = _efl_util_gesture_verify_request_notified();
 
    return ret;
 }