From a03f80a845c8ab8e6b23320d5c25cff440652ad6 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 10 Dec 2015 11:34:15 -0500
Subject: [PATCH] init ecore-x during wl-x11 init to ensure DISPLAY is set

---
 src/modules/wl_x11/e_mod_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index 75c379f56..e47fe2194 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -66,6 +66,11 @@ e_modapi_init(E_Module *m)
 
    printf("LOAD WL_X11 MODULE\n");
 
+   if (!ecore_x_init(NULL))
+     {
+        fprintf(stderr, "X11 connect failed!\n");
+        return NULL;
+     }
    e_comp_x_randr_canvas_new(ecore_x_window_root_first_get(), 1, 1);
 
    if (!e_comp->ee)
@@ -108,6 +113,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
    /* delete handler for keymap change */
    if (kbd_hdlr) ecore_event_handler_del(kbd_hdlr);
+   ecore_x_shutdown();
 
    return 1;
 }