summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-01-07 14:56:30 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-01-07 15:04:09 -0500
commit09a1e75825b2b3ee6cffe3fc092c77092d497887 (patch)
tree639820453caa097cd78b9b27fff23fb95d6e6f57
parent92481addac649391cd97d73f384dfe23603a4c87 (diff)
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 <cpmichael@osg.samsung.com>
-rw-r--r--src/lib/elm_cnp.c6
-rw-r--r--src/lib/elm_win.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index feea589eb..b06b14894 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -2944,7 +2944,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
2944 if (!(ee = ecore_evas_ecore_evas_get(evas))) 2944 if (!(ee = ecore_evas_ecore_evas_get(evas)))
2945 return EINA_FALSE; 2945 return EINA_FALSE;
2946 2946
2947 parent = ecore_evas_wayland_window_get2(ee); 2947 parent = ecore_evas_wayland2_window_get(ee);
2948 } 2948 }
2949 2949
2950 ecore_wl2_dnd_drag_start(ecore_wl2_window_input_get(win), parent, win); 2950 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)
3469 { 3469 {
3470 ee = ecore_evas_buffer_ecore_evas_parent_get(ee); 3470 ee = ecore_evas_buffer_ecore_evas_parent_get(ee);
3471 if (!ee) return NULL; 3471 if (!ee) return NULL;
3472 win = ecore_evas_wayland_window_get2(ee); 3472 win = ecore_evas_wayland2_window_get(ee);
3473 } 3473 }
3474 else if (!strncmp(engine_name, "wayland", sizeof("wayland") - 1)) 3474 else if (!strncmp(engine_name, "wayland", sizeof("wayland") - 1))
3475 { 3475 {
3476 /* In case the engine is not a buffer, we want to check once. */ 3476 /* In case the engine is not a buffer, we want to check once. */
3477 win = ecore_evas_wayland_window_get2(ee); 3477 win = ecore_evas_wayland2_window_get(ee);
3478 if (!win) return NULL; 3478 if (!win) return NULL;
3479 } 3479 }
3480 } 3480 }
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index f75ba93f2..050e82b9e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2180,7 +2180,7 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee)
2180 if ((!strcmp(engine_name, ELM_WAYLAND_SHM)) || 2180 if ((!strcmp(engine_name, ELM_WAYLAND_SHM)) ||
2181 (!strcmp(engine_name, ELM_WAYLAND_EGL))) 2181 (!strcmp(engine_name, ELM_WAYLAND_EGL)))
2182 { 2182 {
2183 return ecore_evas_wayland_window_get2(ee); 2183 return ecore_evas_wayland2_window_get(ee);
2184 } 2184 }
2185#else 2185#else
2186 (void)ee; 2186 (void)ee;