[EGIT] [core/enlightenment] master 01/02: e_main: init e_xkb before e_comp

[Marcel Hollerbach]

bu5hm4n pushed a commit to branch master.

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

commit b8dd1c5bcdd581a979af7d7b66e1a8faccdf5cff
Author: Marcel Hollerbach <marcel-hollerb...@t-online.de>
Date:   Thu Jan 14 17:06:29 2016 +0100

    e_main: init e_xkb before e_comp
    
    otherwise e_xkb cannot guess what kind of compositor is running.
---
 src/bin/e_main.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 71bc654..b62406c 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -1584,7 +1584,12 @@ _e_main_screens_init(void)
    if (!e_client_init()) return 0;
    TS("\tscreens: win");
    if (!e_win_init()) return 0;
-#ifndef HAVE_WAYLAND_ONLY
+   TS("Compositor Init");
+   if (!e_comp_init())
+     {
+        e_error_message_show(_("Enlightenment cannot create a compositor.\n"));
+        _e_main_shutdown(-1);
+     }
    TS("E_Xkb Init");
    if (!e_xkb_init())
      {
@@ -1592,14 +1597,6 @@ _e_main_screens_init(void)
         _e_main_shutdown(-1);
      }
    TS("E_Xkb Init Done");
-#endif
-
-   TS("Compositor Init");
-   if (!e_comp_init())
-     {
-        e_error_message_show(_("Enlightenment cannot create a compositor.\n"));
-        _e_main_shutdown(-1);
-     }
 
    _e_main_desk_restore();
 

--