devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=99ac0763ab89af93c38b69e87547815c0eb2c46a
commit 99ac0763ab89af93c38b69e87547815c0eb2c46a
Author: Chris Michael <cpmich...@osg.samsung.com>
Date: Thu Jan 7 15:02:13 2016 -0500
ecore-evas: Rename ecore_evas_wayland_window_get2 function
This renames the ecore_evas_wayland_window_get2 function to be
ecore_evas_wayland2_window_get before the 1.17 roll out.
Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
src/lib/ecore_evas/Ecore_Evas.h | 2 +-
src/lib/ecore_evas/ecore_evas.c | 4 ++--
src/lib/ecore_evas/ecore_evas_wayland.h | 2 +-
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 3514d6b..30e45b1 100644
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -1316,7 +1316,7 @@ EAPI void ecore_evas_wayland_move(Ecore_Evas
*ee, int x, int y);
EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x,
int hot_y);
EAPI void ecore_evas_wayland_type_set(Ecore_Evas *ee, int type);
EAPI Ecore_Wl_Window *ecore_evas_wayland_window_get(const Ecore_Evas *ee);
-EAPI Ecore_Wl2_Window *ecore_evas_wayland_window_get2(const Ecore_Evas *ee);
/** @since 1.17 */
+EAPI Ecore_Wl2_Window *ecore_evas_wayland2_window_get(const Ecore_Evas *ee);
/** @since 1.17 */
EAPI Ecore_Cocoa_Window *ecore_evas_cocoa_window_get(const Ecore_Evas *ee);
/** @since 1.17 */
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 076b3f5..d3e3f28 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3998,13 +3998,13 @@ ecore_evas_cocoa_window_get(const Ecore_Evas *ee)
}
EAPI Ecore_Wl2_Window *
-ecore_evas_wayland_window_get2(const Ecore_Evas *ee)
+ecore_evas_wayland2_window_get(const Ecore_Evas *ee)
{
Ecore_Evas_Interface_Wayland *iface;
iface = (Ecore_Evas_Interface_Wayland *)_ecore_evas_interface_get(ee,
"wayland");
EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL);
- return iface->window_get2(ee);
+ return iface->window2_get(ee);
}
EAPI Ecore_Evas *
diff --git a/src/lib/ecore_evas/ecore_evas_wayland.h
b/src/lib/ecore_evas/ecore_evas_wayland.h
index ab3894e..b75f779 100644
--- a/src/lib/ecore_evas/ecore_evas_wayland.h
+++ b/src/lib/ecore_evas/ecore_evas_wayland.h
@@ -12,7 +12,7 @@ struct _Ecore_Evas_Interface_Wayland
void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
void (*type_set)(Ecore_Evas *ee, int type);
Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
- Ecore_Wl2_Window *(*window_get2)(const Ecore_Evas *ee);
+ Ecore_Wl2_Window *(*window2_get)(const Ecore_Evas *ee);
void (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void
(*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
};
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index f10f4d0..40db840 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1561,7 +1561,7 @@ _ecore_evas_wl_interface_new(void)
iface->move = _ecore_evas_wayland_move;
/* iface->pointer_set = _ecore_evas_wayland_pointer_set; */
iface->type_set = _ecore_evas_wayland_type_set;
- iface->window_get2 = _ecore_evas_wayland_window_get;
+ iface->window2_get = _ecore_evas_wayland_window_get;
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
iface->pre_post_swap_callback_set =
--
