devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7ae6c7d11d7e56a8ca01bdbb50ca7c250c128e30
commit 7ae6c7d11d7e56a8ca01bdbb50ca7c250c128e30 Author: Chris Michael <cp.mich...@samsung.com> Date: Mon Sep 28 13:42:38 2015 -0400 ecore-wl2: Port Ecore_Evas engines to use Ecore_Wl2 code Signed-off-by: Chris Michael <cp.mich...@samsung.com> --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 4 +--- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 7 +++++++ src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) 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 b61f7bf..810e17b 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 @@ -1527,9 +1527,7 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee) { Ecore_Evas_Engine_Wl_Data *wdata; - if (!(!strncmp(ee->driver, "wayland", 7))) - return NULL; - + if (!ee) return; wdata = ee->engine.data; return wdata->win; } diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index ae4c4bc..0c5f8d5 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -156,6 +156,13 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, return NULL; } + ewd = ecore_wl2_display_connect(disp_name); + if (!ewd) + { + ERR("Failed to connect to Wayland Display %s", disp_name); + return NULL; + } + if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { ERR("Failed to allocate Ecore_Evas"); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index 2301c68..52d1c68 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -155,6 +155,13 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, return NULL; } + ewd = ecore_wl2_display_connect(disp_name); + if (!ewd) + { + ERR("Failed to connect to Wayland Display %s", disp_name); + return NULL; + } + if (!(ee = calloc(1, sizeof(Ecore_Evas)))) { ERR("Failed to allocate Ecore_Evas"); --