Fix bugs in applying capsulation of e_comp

Change-Id: I88e3305515aa3b721ce7f84650592502fae17239

diff --git a/src/e_mod_gesture_events.c b/src/e_mod_gesture_events.c
index 2544df8f3cf4e8f2db122de76328dab5d5eafde8..7c066c22008d37d7b1114e0f2f62121a2639c38c 100644 (file)
--- a/src/e_mod_gesture_events.c
+++ b/src/e_mod_gesture_events.c
@@ -556,7 +556,7 @@ _e_gesture_process_edge_swipe_down(Ecore_Event_Mouse_Button *ev)
                }
           }
 
-        e_comp_size_get(&comp_w, comp_h);
+        e_comp_size_get(&comp_w, &comp_h);
         if (ev->y < conf->edge_swipe.area_offset)
           edge_swipes->base.edge = E_GESTURE_EDGE_TOP;
         else if (ev->y > comp_h - conf->edge_swipe.area_offset)
@@ -812,7 +812,7 @@ _e_gesture_process_edge_drag_down(Ecore_Event_Mouse_Button *ev)
                }
           }
 
-        e_comp_size_get(&comp_w, comp_h);
+        e_comp_size_get(&comp_w, &comp_h);
         if (ev->y < conf->edge_drag.area_offset)
           edge_drags->base.edge = E_GESTURE_EDGE_TOP;
         else if (ev->y > comp_h - conf->edge_drag.area_offset)

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index b91b3ad65c19d20f9227e20394c666b955090f3e..b5823827b606b15aa3489a73c1aac993e2e49585 100644 (file)
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -1785,7 +1785,6 @@ _e_gesture_deactivate_surface_check(E_Client *ec)
    struct wl_resource *surface;
 
    EINA_SAFETY_ON_NULL_RETURN(ec);
-   EINA_SAFETY_ON_NULL_RETURN(e_comp_wl_data_check(ec));
 
    surface = e_comp_wl_wl_surface_get(ec);
    if (!surface) return;
@@ -1829,7 +1828,6 @@ _e_gesture_cb_client_focus_in(void *data, int type, void *event)
    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, ECORE_CALLBACK_PASS_ON);
    ec = ev->ec;
    EINA_SAFETY_ON_NULL_RETURN_VAL(ec, ECORE_CALLBACK_PASS_ON);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_wl_data_check(ec), ECORE_CALLBACK_PASS_ON);
 
    _e_gesture_window_gesture_disabled_change(ec);
    _e_gesture_deactivate_surface_check(ec);
@@ -1843,7 +1841,7 @@ _e_gesture_cb_aux_hint_change(void *data EINA_UNUSED, E_Client *ec)
    E_Client *qp_ec;
    Eina_List *list, *l;
    Eina_Bool res_return = EINA_FALSE;
-   if (e_object_is_del(E_OBJECT(ec)) || !e_comp_wl_data_check(ec)) return;
+   if (e_object_is_del(E_OBJECT(ec))) return;
    if (!e_comp_wl_aux_hint_changed_get(ec)) return;
 
    list = e_service_quickpanels_get();
@@ -1940,12 +1938,6 @@ _e_gesture_init(E_Module *m)
         return NULL;
      }
 
-   if (!e_comp_get())
-     {
-        GTERR("Failed to initialize gesture module ! (e_comp_get() == NULL)\n");
-        goto err;
-     }
-
    /* Add filtering mechanism
     * FIXME: Add handlers after first gesture is grabbed
     */