Created attachment 224349 [details] [review]
keyboard: Fix gtk+ module getting set to ibus for xkb sources

We can't re-use set_ibus_engine() when setting the xkb engine because
that will unconditionally set the gtk+ module to ibus on finish.

Don't you always have to update the gtk module setting to keep it in sync with the engine setting ? (ibus for ibus engines, simple for xkb layouts).

I think you probably want to pass the engine_id along and look at it in set_ibus_engine_finish() to decide which gtk module to activate.

Created attachment 224353 [details] [review]
keyboard: Fix gtk+ IM module getting set to ibus for xkb sources

Instead of waiting until the async ibus engine set call to finish to
set the gtk+ IM module to 'ibus' we can just set the module
unconditionally. The user visible effect is the same, i.e. the user
will have to change to another input source because the current one
isn't working right and it simplifies the code.

Review of attachment 224353 [details] [review]:

Looks good to me

Attachment 224353 [details] pushed as 4433ec8 - keyboard: Fix gtk+ IM module getting set to ibus for xkb sources