[gnome-shell/wip/carlosg/xim-for-x11] ibusManager: Ensure to spawn --xim on non-wayland sessions

[Carlos Garnacho <carlosg src gnome org>]

commit bab6175e4f3b997c96ad9db1caba62fe4bea02f5
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Mar 4 17:52:27 2020 +0100

    ibusManager: Ensure to spawn --xim on non-wayland sessions
    
    This (mistakenly) now only depends on signals triggered on Wayland
    sessions. Hardcoding the XIM support on X11 sessions will make input
    in some clients work again.
    
    Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1690

 js/misc/ibusManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index 2049758eab..aa1f510602 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported getIBusManager */
 
-const { Gio, GLib, IBus } = imports.gi;
+const { Gio, GLib, IBus, Meta } = imports.gi;
 const Signals = imports.signals;
 
 const IBusCandidatePopup = imports.ui.ibusCandidatePopup;
@@ -55,7 +55,7 @@ var IBusManager = class {
         this._ibus.set_watch_ibus_signal(true);
         this._ibus.connect('global-engine-changed', this._engineChanged.bind(this));
 
-        this._spawn();
+        this._spawn(Meta.is_wayland_compositor() ? [] : ['--xim']);
     }
 
     _spawn(extraArgs = []) {