summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2015-04-21 10:06:38 -0400
committerChris Michael <cp.michael@samsung.com>2015-04-21 10:06:39 -0400
commitc77812d8b0cb7664b5925922c66993482d4451df (patch)
treed1ef4a8c2ad51e6c81c47b3a709db26863170aa4 /src/modules
parent2e49f60f611dee0494850fa5b78880cdbaed2d48 (diff)
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
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_imf/wayland/wayland_module.c7
1 files changed, 7 insertions, 0 deletions
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)
143 _ecore_imf_wayland_log_dom = 143 _ecore_imf_wayland_log_dom =
144 eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW); 144 eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW);
145 145
146 if (!getenv("WAYLAND_DISPLAY"))
147 return EINA_FALSE;
148
149 if (!ecore_wl_init(NULL))
150 return EINA_FALSE;
151
146 ecore_imf_module_register(&wayland_im_info, im_module_create, 152 ecore_imf_module_register(&wayland_im_info, im_module_create,
147 im_module_exit); 153 im_module_exit);
148 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized"); 154 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized");
@@ -154,6 +160,7 @@ static void
154im_module_shutdown(void) 160im_module_shutdown(void)
155{ 161{
156 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown"); 162 EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown");
163 ecore_wl_shutdown();
157} 164}
158 165
159EINA_MODULE_INIT(im_module_init); 166EINA_MODULE_INIT(im_module_init);