ecore-wl2: Remove usage of pointer update timer
authorChris Michael <cp.michael@samsung.com>
Wed, 26 Oct 2016 14:53:56 +0000 (10:53 -0400)
committerChris Michael <cp.michael@samsung.com>
Wed, 26 Oct 2016 15:01:13 +0000 (11:01 -0400)
As we are no longer using X pointer images, we no longer have the need
for an Ecore_Timer to update any animated X images so remove.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
src/lib/ecore_wl2/ecore_wl2_input.c
src/lib/ecore_wl2/ecore_wl2_private.h

index 93fdb21..909cc5f 100644 (file)
@@ -1333,9 +1333,11 @@ _ecore_wl2_input_cursor_set(Ecore_Wl2_Input *input, const char *cursor)
 void
 _ecore_wl2_input_cursor_update_stop(Ecore_Wl2_Input *input)
 {
-   if (!input->cursor.timer) return;
-   ecore_timer_del(input->cursor.timer);
-   input->cursor.timer = NULL;
+   if (input->cursor.frame_cb)
+     {
+        wl_callback_destroy(input->cursor.frame_cb);
+        input->cursor.frame_cb = NULL;
+     }
 }
 
 EAPI void
index 75330d4..6d7cfb0 100644 (file)
@@ -357,7 +357,6 @@ struct _Ecore_Wl2_Input
         struct wl_surface *surface;
         struct wl_callback *frame_cb;
         int hot_x, hot_y;
-        Ecore_Timer *timer;
      } cursor;
 
    struct