edge_drag: fix typos to prevent abnormal behaviors

Change-Id: I5bc52ca737ea295a127b22a18c4412ef6117029d

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index c0fd5fdda61256651038c4250c01f2452474d35c..ada2c28388f9b0a1ee8f3226c044225118b75ea5 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -193,7 +193,7 @@ _e_gesture_edge_drag_current_list_check(void)
           }
         gev->edge_drags.base.fingers[i].enabled = EINA_FALSE;
      }
-   gesture->grabbed_gesture &= ~E_GESTURE_TYPE_EDGE_SWIPE;
+   gesture->grabbed_gesture &= ~E_GESTURE_TYPE_EDGE_DRAG;
    if (gev->event_keep) gesture->event_state = E_GESTURE_EVENT_STATE_PROPAGATE;
 }
 
@@ -1314,6 +1314,7 @@ _e_gesture_deactivate_cb_client_listener(struct wl_listener *l, void *data)
    struct wl_client *client = data;
 
    _e_gesture_deactivate_list_unset(client, NULL, &gesture->gesture_events.edge_swipes.base.activation, E_GESTURE_TYPE_EDGE_SWIPE);
+   _e_gesture_deactivate_list_unset(client, NULL, &gesture->gesture_events.edge_drags.base.activation, E_GESTURE_TYPE_EDGE_DRAG);
    _e_gesture_deactivate_list_unset(client, NULL, &gesture->gesture_events.taps.activation, E_GESTURE_TYPE_TAP);
    _e_gesture_deactivate_list_unset(client, NULL, &gesture->gesture_events.palm_covers.activation, E_GESTURE_TYPE_PALM_COVER);
    _e_gesture_deactivate_list_unset(client, NULL, &gesture->gesture_events.pans.activation, E_GESTURE_TYPE_PAN);
@@ -1329,6 +1330,7 @@ _e_gesture_deactivate_cb_surface_listener(struct wl_listener *l, void *data)
    struct wl_resource *surface = data;
 
    _e_gesture_deactivate_list_unset(NULL, surface, &gesture->gesture_events.edge_swipes.base.activation, E_GESTURE_TYPE_EDGE_SWIPE);
+   _e_gesture_deactivate_list_unset(NULL, surface, &gesture->gesture_events.edge_drags.base.activation, E_GESTURE_TYPE_EDGE_DRAG);
    _e_gesture_deactivate_list_unset(NULL, surface, &gesture->gesture_events.taps.activation, E_GESTURE_TYPE_TAP);
    _e_gesture_deactivate_list_unset(NULL, surface, &gesture->gesture_events.palm_covers.activation, E_GESTURE_TYPE_PALM_COVER);
    _e_gesture_deactivate_list_unset(NULL, surface, &gesture->gesture_events.pans.activation, E_GESTURE_TYPE_PAN);
@@ -1422,6 +1424,10 @@ _e_gesture_deactivate_set(struct wl_client *client,
      {
         ret = _e_gesture_deactivate_list_set(client, surface, &gesture->gesture_events.edge_swipes.base.activation, E_GESTURE_TYPE_EDGE_SWIPE);
      }
+   if (type & E_GESTURE_TYPE_EDGE_DRAG)
+     {
+        ret = _e_gesture_deactivate_list_set(client, surface, &gesture->gesture_events.edge_drags.base.activation, E_GESTURE_TYPE_EDGE_DRAG);
+     }
    if (type & E_GESTURE_TYPE_TAP)
      {
         ret = _e_gesture_deactivate_list_set(client, surface, &gesture->gesture_events.taps.activation, E_GESTURE_TYPE_TAP);
@@ -1454,6 +1460,11 @@ _e_gesture_deactivate_unset(struct wl_client *client,
      {
         _e_gesture_deactivate_list_unset(client, surface, &gesture->gesture_events.edge_swipes.base.activation, E_GESTURE_TYPE_EDGE_SWIPE);
      }
+   if (type & E_GESTURE_TYPE_EDGE_DRAG)
+     {
+        _e_gesture_deactivate_list_unset(client, surface, &gesture->gesture_events.edge_drags.base.activation, E_GESTURE_TYPE_EDGE_DRAG);
+     }
+
    if (type & E_GESTURE_TYPE_TAP)
      {
         _e_gesture_deactivate_list_unset(client, surface, &gesture->gesture_events.taps.activation, E_GESTURE_TYPE_TAP);
@@ -1525,7 +1536,7 @@ _e_gesture_cb_grab_edge_drag(struct wl_client *client,
    else
      ret = TIZEN_GESTURE_ERROR_NO_PERMISSION;
 
-   tizen_gesture_send_grab_edge_swipe_notify(resource, fingers, edge, edge_size, start_point, end_point, ret);
+   tizen_gesture_send_edge_drag_notify(resource, fingers, edge, edge_size, start_point, end_point, ret);
 }
 
 static void
@@ -1543,7 +1554,7 @@ _e_gesture_cb_ungrab_edge_drag(struct wl_client *client,
    else
      ret = TIZEN_GESTURE_ERROR_NO_PERMISSION;
 
-   tizen_gesture_send_grab_edge_swipe_notify(resource, fingers, edge, edge_size, start_point, end_point, ret);
+   tizen_gesture_send_edge_drag_notify(resource, fingers, edge, edge_size, start_point, end_point, ret);
 }
 
 static void
@@ -1772,6 +1783,7 @@ _e_gesture_deactivate_surface_check(E_Client *ec)
    if (!surface) return;
 
    _e_gesture_deactivate_surface_list_check(surface, &gesture->gesture_events.edge_swipes.base.activation);
+   _e_gesture_deactivate_surface_list_check(surface, &gesture->gesture_events.edge_drags.base.activation);
    _e_gesture_deactivate_surface_list_check(surface, &gesture->gesture_events.taps.activation);
    _e_gesture_deactivate_surface_list_check(surface, &gesture->gesture_events.palm_covers.activation);
    _e_gesture_deactivate_surface_list_check(surface, &gesture->gesture_events.pans.activation);