[EGIT] [core/efl] master 258/262: ecore-wl2: Port Ecore_Evas engines to use Ecore_Wl2 code

[Christopher Michael]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=caa1b4323b9a3331b2429579a1b3b07a04931bae

commit caa1b4323b9a3331b2429579a1b3b07a04931bae
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, 17 insertions(+), 1 deletion(-)

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 46a8d25..b24883a 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
@@ -1536,7 +1536,9 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee)
 {
    Ecore_Evas_Engine_Wl_Data *wdata;
 
-   if (!ee) return;
+   if (!(!strncmp(ee->driver, "wayland", 7)))
+     return NULL;
+
    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 0c5f8d5..cb7befb 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
@@ -163,6 +163,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 52d1c68..e8be589 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
@@ -162,6 +162,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");

--