From b90d8024fa71078a91e191348c7defc959a64286 Mon Sep 17 00:00:00 2001
From: Stephen 'Okra' Houston <smhouston88@gmail.com>
Date: Wed, 16 Jan 2019 13:24:49 -0500
Subject: [PATCH] XKBswitch gadget: Make sure to update the wayland keymap
 index.

Fixes T6321
---
 src/modules/xkbswitch/e_mod_main.c       | 6 ++++++
 src/modules/xkbswitch/gadget/xkbswitch.c | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index 4806ebc33..af1b80165 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -519,5 +519,11 @@ _e_xkb_cb_lmenu_set(void *data, E_Menu *mn EINA_UNUSED, E_Menu_Item *mi EINA_UNU
    e_xkb_layout_set(cl);
    e_config_xkb_layout_free(e_config->xkb.sel_layout);
    e_config->xkb.sel_layout = e_config_xkb_layout_dup(cl);
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+#ifdef HAVE_WAYLAND
+     e_comp_wl_input_keymap_index_set(cur_group);
+#else
+     (void)cur_group;
+#endif
 }
 
diff --git a/src/modules/xkbswitch/gadget/xkbswitch.c b/src/modules/xkbswitch/gadget/xkbswitch.c
index f63947146..fd38bd57f 100644
--- a/src/modules/xkbswitch/gadget/xkbswitch.c
+++ b/src/modules/xkbswitch/gadget/xkbswitch.c
@@ -104,6 +104,12 @@ _xkbg_cb_menu_set(void *data, Evas_Object *obj, void *event_data EINA_UNUSED)
    e_xkb_layout_set(cl);
    e_config_xkb_layout_free(e_config->xkb.sel_layout);
    e_config->xkb.sel_layout = e_config_xkb_layout_dup(cl);
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+#ifdef HAVE_WAYLAND
+     e_comp_wl_input_keymap_index_set(cur_group);
+#else
+     (void)cur_group;
+#endif
 }
 
 static void