devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=4e35e34b164b5eb309493e4b0751dc0b870b03bf

commit 4e35e34b164b5eb309493e4b0751dc0b870b03bf
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Thu Oct 1 10:24:43 2015 -0400

    elementary: Port elementary cursor code to use ecore_wl2 library
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/lib/els_cursor.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 4e6a443..ac6ede2 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -146,9 +146,9 @@ struct _Elm_Cursor
      Ecore_X_Window win;
    } x;
 #endif
-#ifdef HAVE_ELEMENTARY_WAYLAND
+#ifdef HAVE_ELEMENTARY_WL2
    struct {
-     Ecore_Wl_Window *win;
+     Ecore_Wl2_Window *win;
    } wl;
 #endif
 
@@ -282,9 +282,9 @@ _elm_cursor_set(Elm_Cursor *cur)
         if (cur->x.win)
           ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
 #endif
-#ifdef HAVE_ELEMENTARY_WAYLAND
+#ifdef HAVE_ELEMENTARY_WL2
         if (cur->wl.win)
-          ecore_wl_window_cursor_from_name_set(cur->wl.win, cur->cursor_name);
+          ecore_wl2_window_cursor_from_name_set(cur->wl.win, cur->cursor_name);
 #endif
      }
    evas_event_thaw(cur->evas);
@@ -340,9 +340,9 @@ _elm_cursor_mouse_out(void *data, Evas *evas EINA_UNUSED, 
Evas_Object *obj EINA_
         if (cur->x.win)
           ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
 #endif
-#ifdef HAVE_ELEMENTARY_WAYLAND
+#ifdef HAVE_ELEMENTARY_WL2
         if (cur->wl.win)
-          ecore_wl_window_cursor_default_restore(cur->wl.win);
+          ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
 #endif
      }
    evas_event_thaw(cur->evas);
@@ -418,7 +418,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
                     cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
                }
 #endif
-#ifdef HAVE_ELEMENTARY_WAYLAND
+#ifdef HAVE_ELEMENTARY_WL2
              cur->wl.win = elm_win_wl_window_get(top);
 #endif
           }
@@ -541,9 +541,9 @@ elm_object_cursor_unset(Evas_Object *obj)
         else if (cur->x.win)
           ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
 #endif
-#ifdef HAVE_ELEMENTARY_WAYLAND
+#ifdef HAVE_ELEMENTARY_WL2
         else if (cur->wl.win)
-          ecore_wl_window_cursor_default_restore(cur->wl.win);
+          ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
 #endif
      }
 

-- 


Reply via email to