From b82446cf5d33676f5e766bbc6fdf2cca630e47bb Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 7 Jan 2016 14:56:30 -0500 Subject: [PATCH] elementary: Fix calls to ecore_evas_wayland_window_get2 As we've renamed the function, the calls to it should be updated to use the new function name Signed-off-by: Chris Michael --- legacy/elementary/src/lib/elm_cnp.c | 6 +++--- legacy/elementary/src/lib/elm_win.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_cnp.c b/legacy/elementary/src/lib/elm_cnp.c index feea589..b06b148 100644 --- a/legacy/elementary/src/lib/elm_cnp.c +++ b/legacy/elementary/src/lib/elm_cnp.c @@ -2944,7 +2944,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, if (!(ee = ecore_evas_ecore_evas_get(evas))) return EINA_FALSE; - parent = ecore_evas_wayland_window_get2(ee); + parent = ecore_evas_wayland2_window_get(ee); } ecore_wl2_dnd_drag_start(ecore_wl2_window_input_get(win), parent, win); @@ -3469,12 +3469,12 @@ _wl_elm_widget_window_get(const Evas_Object *obj) { ee = ecore_evas_buffer_ecore_evas_parent_get(ee); if (!ee) return NULL; - win = ecore_evas_wayland_window_get2(ee); + win = ecore_evas_wayland2_window_get(ee); } else if (!strncmp(engine_name, "wayland", sizeof("wayland") - 1)) { /* In case the engine is not a buffer, we want to check once. */ - win = ecore_evas_wayland_window_get2(ee); + win = ecore_evas_wayland2_window_get(ee); if (!win) return NULL; } } diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index f75ba93..050e82b 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -2180,7 +2180,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee) if ((!strcmp(engine_name, ELM_WAYLAND_SHM)) || (!strcmp(engine_name, ELM_WAYLAND_EGL))) { - return ecore_evas_wayland_window_get2(ee); + return ecore_evas_wayland2_window_get(ee); } #else (void)ee; -- 2.7.4