From: Derek Foreman <derekf@osg.samsung.com>
Date: Wed, 4 Jan 2017 16:33:34 +0000 (-0600)
Subject: ecore_wl2: Remove the rest of the cursor frame callback
X-Git-Tag: upstream/1.20.0~2531
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8328d4db89d0d422677a62de890c10d0180a86f8;p=platform%2Fupstream%2Fefl.git

ecore_wl2: Remove the rest of the cursor frame callback

Oops, I made a clean spot, now I need to clean up the rest of this.

ref 641dfab516b8de1cf27ca07671ff73de6c8d32bf
---

diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 63ee07d..c2fbe48 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -1459,8 +1459,6 @@ _ecore_wl2_input_del(Ecore_Wl2_Input *input)
 
    if (input->repeat.timer) ecore_timer_del(input->repeat.timer);
 
-   _ecore_wl2_input_cursor_update_stop(input);
-
    if (input->cursor.name) eina_stringshare_del(input->cursor.name);
 
    if (input->data.types.data)
@@ -1498,23 +1496,11 @@ _ecore_wl2_input_del(Ecore_Wl2_Input *input)
 void
 _ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input, const char *cursor)
 {
-   _ecore_wl2_input_cursor_update_stop(input);
-
    eina_stringshare_replace(&input->cursor.name, cursor);
    if (!cursor) eina_stringshare_replace(&input->cursor.name, "left_ptr");
 }
 
 void
-_ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input)
-{
-   if (input->cursor.frame_cb)
-     {
-        wl_callback_destroy(input->cursor.frame_cb);
-        input->cursor.frame_cb = NULL;
-     }
-}
-
-void
 _ecore_wl2_input_window_remove(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window)
 {
    Ecore_Wl2_Input_Devices *devices;
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 8486647..56a8c0c 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -360,7 +360,6 @@ struct _Ecore_Wl2_Input
         const char *name;
         unsigned int size;
         struct wl_surface *surface;
-        struct wl_callback *frame_cb;
         int hot_x, hot_y;
      } cursor;
 
@@ -455,7 +454,6 @@ void _ecore_wl2_input_grab(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, uns
 
 void _ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input, const char *cursor);
 Eina_Bool _ecore_wl2_input_cursor_update(void *data);
-void _ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input);
 void _ecore_wl2_input_window_remove(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window);
 
 void _ecore_wl2_dnd_add(Ecore_Wl2_Input *input, struct wl_data_offer *offer);
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 33e6c02..2314b78 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1240,8 +1240,6 @@ ecore_wl2_window_pointer_set(Ecore_Wl2_Window *window, struct wl_surface *surfac
    input = ecore_wl2_window_input_get(window);
    if (!input) return;
 
-   _ecore_wl2_input_cursor_update_stop(input);
-
    input->cursor.surface = surface;
    input->cursor.hot_x = hot_x;
    input->cursor.hot_y = hot_y;