[EGIT] [core/efl] master 01/02: WIP

[Etrunko]

etrunko pushed a commit to branch master.

commit 2d84a8a8fbe8c9bcac625351b845b517e0d0f9bf
Author: Eduardo Lima (Etrunko) <eduardo.l...@intel.com>
Date:   Wed Jun 26 10:55:14 2013 -0300

    WIP
    
    Signed-off-by: Eduardo Lima (Etrunko) <eduardo.l...@intel.com>
---
 src/modules/ecore_imf/wayland/wayland_module.c | 36 ++++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/modules/ecore_imf/wayland/wayland_module.c 
b/src/modules/ecore_imf/wayland/wayland_module.c
index b7176d9..37f84a6 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -92,6 +92,22 @@ im_module_create()
    Ecore_IMF_Context *ctx = NULL;
    WaylandIMContext *ctxd = NULL;
 
+   if (!text_input_manager)
+     {
+        Ecore_Wl_Global *global;
+        struct wl_registry *registry = ecore_wl_registry_get();
+        struct wl_list *globals = ecore_wl_globals_get();
+
+        wl_list_for_each(global, globals, link)
+          {
+             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");
+               }
+          }
+     }
+
    ctxd = wayland_im_context_new(text_input_manager);
    if (!ctxd)
      {
@@ -113,31 +129,11 @@ im_module_create()
 static Eina_Bool
 im_module_init(void)
 {
-   struct wl_registry *registry;
-   struct wl_list *globals;
-   Ecore_Wl_Global *global;
-
    if (!ecore_wl_init(NULL)) return EINA_FALSE;
 
    _ecore_imf_wayland_log_dom = 
      eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW);
 
-   ecore_wl_display_iterate();
-   registry = ecore_wl_registry_get();
-   globals = ecore_wl_globals_get();
-
-   wl_list_for_each(global, globals, link)
-      {
-         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");
-           }
-      }
-
    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");

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev