#4449 let ibus set the layout

Xpra-org · Feb 5, 2025 · b312f45 · b312f45
1 parent 1c7cd35
commit b312f45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xpra/client/gtk3/tray_menu.py b/xpra/client/gtk3/tray_menu.py
@@ -1226,7 +1226,8 @@ def set_layout(item) -> None:
                 kh.update()
                 kh.send_layout()
                 log.info(f"{msg}: {kh.layout_str()}")
-                kh.send_keymap()
+                if not backend:
+                    kh.send_keymap()
 
         l = self.checkitem(str(title), set_layout, active)
         l.set_draw_as_radio(True)

diff --git a/xpra/server/mixins/input.py b/xpra/server/mixins/input.py
@@ -183,7 +183,6 @@ def _process_layout_changed(self, proto, packet: PacketType) -> None:
                 ibuslog(f"ibus set engine to {name!r}")
                 layout, variant, options = get_engine_layout_spec()
                 ibuslog(f"ibus layout: {layout} {variant=}, {options=}")
-                return
         if ss.set_layout(layout, variant, options):
             self.set_keymap(ss, force=True)