From c74a796e0288e18819ff0980f519c21c2bd94199 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 11 Apr 2013 08:32:04 +0100 Subject: [PATCH] Initialize keyboard before initializing comp module. This is needed so that setxkbmap runs before we initialize the wayland compositor So that wayland clients can use the proper keymap. Signed-off-by: Chris Michael --- src/bin/e_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index a6cc382c0..eba31880c 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -935,13 +935,6 @@ main(int argc, char **argv) _e_main_shutdown(-1); } TS("E_Mouse Init Done"); - TS("E_Xkb Init"); - if (!e_xkb_init()) - { - e_error_message_show(_("Enlightenment cannot setup XKB Keyboard layouts.\n")); - _e_main_shutdown(-1); - } - TS("E_Xkb Init Done"); if (e_config->show_splash) e_init_status_set(_("Setup Bindings")); @@ -1689,6 +1682,13 @@ _e_main_screens_init(void) return 0; } + TS("E_Xkb Init"); + if (!e_xkb_init()) + { + e_error_message_show(_("Enlightenment cannot setup XKB Keyboard layouts.\n")); + _e_main_shutdown(-1); + } + TS("E_Xkb Init Done"); TS("E_Comp Init"); e_comp_init();