diff options
| author | Chris Michael <cp.michael@samsung.com> | 2013-06-25 09:31:52 +0100 |
|---|---|---|
| committer | Chris Michael <cp.michael@samsung.com> | 2013-06-25 09:31:52 +0100 |
| commit | aa54fcf059b72467516f0e4d438062502b021746 (patch) | |
| tree | f54f6abb94c24b72147b30af745abff0839f3e9c | |
| parent | 75639bea4987f36fac3484bdd802b8ca8c462e8d (diff) | |
| download | efl-aa54fcf059b72467516f0e4d438062502b021746.tar.gz | |
Check that ecore_wl_init succeeds before trying to make calls into it.
Fix formatting.
Signed-off-by: Chris Michael <cp.michael@samsung.com>
| -rw-r--r-- | src/modules/ecore_imf/wayland/wayland_module.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/modules/ecore_imf/wayland/wayland_module.c b/src/modules/ecore_imf/wayland/wayland_module.c index 6b4e337fa5..b7176d96cf 100644 --- a/src/modules/ecore_imf/wayland/wayland_module.c +++ b/src/modules/ecore_imf/wayland/wayland_module.c @@ -117,9 +117,10 @@ im_module_init(void) struct wl_list *globals; Ecore_Wl_Global *global; - ecore_wl_init(NULL); + if (!ecore_wl_init(NULL)) return EINA_FALSE; - _ecore_imf_wayland_log_dom = eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW); + _ecore_imf_wayland_log_dom = + eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW); ecore_wl_display_iterate(); registry = ecore_wl_registry_get(); @@ -129,12 +130,16 @@ im_module_init(void) { if (!strcmp(global->interface, "wl_text_input_manager")) { - text_input_manager = wl_registry_bind(registry, global->id, &wl_text_input_manager_interface, 1); - EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "bound wl_text_input_manager interface"); + text_input_manager = + wl_registry_bind(registry, global->id, + &wl_text_input_manager_interface, 1); + EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, + "bound wl_text_input_manager interface"); } } - ecore_imf_module_register(&wayland_im_info, im_module_create, im_module_exit); + 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"); return EINA_TRUE; |