[gnome-shell/wip/carlosg/xwayland-startup-side-channel: 35/36] ibusManager: Drop restartDaemon() call

[Florian Müllner <fmuellner src gnome org>]

commit 4244a5e01993b35a33afcd5b0d6ddd2c137b5d2e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Nov 14 23:55:21 2019 +0100

    ibusManager: Drop restartDaemon() call
    
    This will be handled differently.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/836

 js/misc/ibusManager.js | 8 ++------
 js/ui/windowManager.js | 3 ---
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index cc699c33c2..9bc94c1487 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -58,19 +58,15 @@ var IBusManager = class {
         this._spawn();
     }
 
-    _spawn(extraArgs = []) {
+    _spawn() {
         try {
-            let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
+            let cmdLine = ['ibus-daemon', '--panel', 'disable'];
             Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
         } catch (e) {
             log(`Failed to launch ibus-daemon: ${e.message}`);
         }
     }
 
-    restartDaemon(extraArgs = []) {
-        this._spawn(['-r', ...extraArgs]);
-    }
-
     _clear() {
         if (this._cancellable) {
             this._cancellable.cancel();
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 8634274a49..a39f5baacd 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -16,7 +16,6 @@ const EdgeDragAction = imports.ui.edgeDragAction;
 const CloseDialog = imports.ui.closeDialog;
 const SwipeTracker = imports.ui.swipeTracker;
 const SwitchMonitor = imports.ui.switchMonitor;
-const IBusManager = imports.misc.ibusManager;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
@@ -895,12 +894,10 @@ var WindowManager = class {
         });
 
         global.display.connect('x11-display-opened', () => {
-            IBusManager.getIBusManager().restartDaemon(['--xim']);
             Shell.util_start_systemd_unit('gnome-session-x11-services.target', 'fail');
         });
         global.display.connect('x11-display-closing', () => {
             Shell.util_stop_systemd_unit('gnome-session-x11-services.target', 'fail');
-            IBusManager.getIBusManager().restartDaemon();
         });
 
         Main.overview.connect('showing', () => {