devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=3a15df2454f36a7210a731a71e95a03b8b81fe51

commit 3a15df2454f36a7210a731a71e95a03b8b81fe51
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Wed May 13 12:26:07 2015 -0400

    fix numerous compile errors from D2482
    
    NB: Mental Note: COMPILE BEFORE PUSH !!
    
     # butts
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/e_comp_wl.c       | 18 +++++++++---------
 src/bin/e_comp_wl_input.h |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 1259ca5..cf4794b 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -363,15 +363,15 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas 
EINA_UNUSED, Evas_Object *o
    Evas_Event_Multi_Down *ev = event;
    wl_fixed_t x, y;
 
-   if (!ec->comp_data->surface) return EINA_FALSE;
+   if (!ec->comp_data->surface) return;
 
    wc = wl_resource_get_client(ec->comp_data->surface);
-   serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
+   serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
 
    x = wl_fixed_from_int(ev->canvas.x - ec->client.x);
    y = wl_fixed_from_int(ev->canvas.y - ec->client.y);
 
-   EINA_LIST_FOREACH(ec->comp->wl_comp_data->touch.resources, l, res)
+   EINA_LIST_FOREACH(e_comp->wl_comp_data->touch.resources, l, res)
      {
         if (wl_resource_get_client(res) != wc) continue;
         if (!e_comp_wl_input_touch_check(res)) continue;
@@ -389,12 +389,12 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas 
EINA_UNUSED, Evas_Object *obj
    E_Client *ec = data;
    Evas_Event_Multi_Up *ev = event;
 
-   if (!ec->comp_data->surface) return EINA_FALSE;
+   if (!ec->comp_data->surface) return;
 
    wc = wl_resource_get_client(ec->comp_data->surface);
-   serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
+   serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
 
-   EINA_LIST_FOREACH(ec->comp->wl_comp_data->touch.resources, l, res)
+   EINA_LIST_FOREACH(e_comp->wl_comp_data->touch.resources, l, res)
      {
         if (wl_resource_get_client(res) != wc) continue;
         if (!e_comp_wl_input_touch_check(res)) continue;
@@ -413,15 +413,15 @@ _e_comp_wl_evas_cb_multi_move(void *data, Evas *evas 
EINA_UNUSED, Evas_Object *o
    Evas_Event_Multi_Move *ev = event;
    wl_fixed_t x, y;
 
-   if (!ec->comp_data->surface) return EINA_FALSE;
+   if (!ec->comp_data->surface) return;
 
    wc = wl_resource_get_client(ec->comp_data->surface);
-   serial = wl_display_next_serial(ec->comp->wl_comp_data->wl.disp);
+   serial = wl_display_next_serial(e_comp->wl_comp_data->wl.disp);
 
    x = wl_fixed_from_int(ev->cur.canvas.x - ec->client.x);
    y = wl_fixed_from_int(ev->cur.canvas.y - ec->client.y);
 
-   EINA_LIST_FOREACH(ec->comp->wl_comp_data->touch.resources, l, res)
+   EINA_LIST_FOREACH(e_comp->wl_comp_data->touch.resources, l, res)
      {
         if (wl_resource_get_client(res) != wc) continue;
         if (!e_comp_wl_input_touch_check(res)) continue;
diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h
index b3e8615..862dc04 100644
--- a/src/bin/e_comp_wl_input.h
+++ b/src/bin/e_comp_wl_input.h
@@ -7,6 +7,7 @@ EINTERN Eina_Bool e_comp_wl_input_init(E_Comp_Data *cdata);
 EINTERN void e_comp_wl_input_shutdown(E_Comp_Data *cdata);
 EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
 EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
+EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res);
 
 EINTERN void e_comp_wl_input_keyboard_modifiers_serialize(E_Comp_Data *cdata);
 EINTERN void e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata);

-- 


Reply via email to