devilhorns pushed a commit to branch master.

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

commit c77812d8b0cb7664b5925922c66993482d4451df
Author: Marcel Hollerbach <marcel-hollerb...@t-online.de>
Date:   Tue Apr 21 10:06:38 2015 -0400

    ecore_imf: init wayland before using wayland calls.
    
    Summary:
    ecore_imf: init wayland if wayland env var exists
    
    Otherwise ecore-wl functions could return some invalid values. The env var 
check to avoid error messages.
    
    @fix
    
    Reviewers: Sergeant_Whitespace, devilhorns
    
    Reviewed By: Sergeant_Whitespace
    
    Subscribers: Sergeant_Whitespace, cedric
    
    Differential Revision: https://phab.enlightenment.org/D2253
---
 src/modules/ecore_imf/wayland/wayland_module.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/ecore_imf/wayland/wayland_module.c 
b/src/modules/ecore_imf/wayland/wayland_module.c
index cfce52b..13d09f2 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -143,6 +143,12 @@ im_module_init(void)
    _ecore_imf_wayland_log_dom = 
      eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW);
 
+   if (!getenv("WAYLAND_DISPLAY"))
+     return EINA_FALSE;
+
+   if (!ecore_wl_init(NULL))
+     return EINA_FALSE;
+
    ecore_imf_module_register(&wayland_im_info, im_module_create, 
                              im_module_exit);
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized");
@@ -154,6 +160,7 @@ static void
 im_module_shutdown(void)
 {
    EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown");
+   ecore_wl_shutdown();
 }
 
 EINA_MODULE_INIT(im_module_init);

-- 


Reply via email to