devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=9e68b402a4e1f42da70d665428e83a65ca4a8d8d

commit 9e68b402a4e1f42da70d665428e83a65ca4a8d8d
Author: Chris Michael <[email protected]>
Date:   Mon Mar 17 13:55:38 2014 +0000

    @bugfix: Initialize the module idler even If we are wayland-only
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/bin/e_comp_wl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a5f3001..aefb315 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -320,6 +320,7 @@ e_comp_wl_init(void)
      ecore_event_handler_add(ECORE_X_EVENT_XKB_STATE_NOTIFY, 
                              e_comp_wl_cb_keymap_changed, NULL);
 #endif
+
    /* get the displays event loop */
    _e_wl_comp->wl.loop = wl_display_get_event_loop(_e_wl_comp->wl.display);
 
@@ -344,10 +345,10 @@ e_comp_wl_init(void)
      }
 
    wl_event_loop_dispatch(_e_wl_comp->wl.loop, 0);
-#ifndef HAVE_WAYLAND_ONLY
+
    /* add an idler for deferred shell module loading */
    _module_idler = ecore_idler_add(_e_comp_wl_cb_module_idle, NULL);
-#endif
+
    /* return success */
    return EINA_TRUE;
 
@@ -355,10 +356,9 @@ err:
    /* remove kbd handler */
    if (_e_wl_comp->kbd_handler) 
      ecore_event_handler_del(_e_wl_comp->kbd_handler);
-#ifndef HAVE_WAYLAND_ONLY
+
    /* remove the module idler */
    if (_module_idler) ecore_idler_del(_module_idler);
-#endif
 
 #ifdef HAVE_WAYLAND_EGL
    /* unbind wayland display */

-- 


Reply via email to