From 044b3eaee1a93ca5ef82eed83675039afd80ef36 Mon Sep 17 00:00:00 2001
From: Matt Rose <mattrose@folkwolf.net>
Date: Mon, 14 Nov 2022 11:00:25 -0500
Subject: [PATCH] Remove all ibus workarounds

I am sick of ibus breaking every single time we issue a new
release, so as of now, I've gone through the code and removed
all of the workarounds that we have put in to try and get
around issues in ibus, and GTK Input Methods in general.

The code as it stands should work, I'm going to mention a
bunch of people in this PR and ask them to beta test this
change.
---
 terminator                  | 18 ------------------
 terminatorlib/terminator.py |  1 -
 2 files changed, 19 deletions(-)

diff --git a/terminator b/terminator
index 14fd9cf3..dcc0ca45 100755
--- a/terminator
+++ b/terminator
@@ -56,25 +56,8 @@ from terminatorlib.configjson import ConfigJson
 
 # Deleting env variable fixes double char problem when broadcasting (#78)
 # Only delete if it exists, or exception occurs
-if os.environ.get('GTK_IM_MODULE') is not None:
-    del os.environ['GTK_IM_MODULE']
 
 if __name__ == '__main__':
-    # Workaround for IBus intefering with broadcast when using dead keys
-    # Environment also needs IBUS_DISABLE_SNOOPER=1, or double chars appear
-    # in the receivers.
-    username = pwd.getpwuid(os.getuid()).pw_name
-    ibus_running = False
-    for proc in psutil.process_iter():
-        try:
-            if proc.name() == 'ibus-daemon' and proc.username() == username:
-                ibus_running = True
-                break
-        except (psutil.AccessDenied) as err:
-            print("error getting details while looking for Ibus process: %s" % err)
-
-    if ibus_running:
-        os.environ['IBUS_DISABLE_SNOOPER']='1'
 
     dbus_service = None
 
@@ -137,7 +120,6 @@ if __name__ == '__main__':
         MAKER = Factory()
         TERMINATOR.set_dbus_data(dbus_service)
         TERMINATOR.reconfigure()
-        TERMINATOR.ibus_running = ibus_running
 
         try:
             dbg('Creating a terminal with layout: %s' % OPTIONS.layout)
diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
index 0fc58d56..168f3ce2 100644
--- a/terminatorlib/terminator.py
+++ b/terminatorlib/terminator.py
@@ -54,7 +54,6 @@ class Terminator(Borg):
     dbus_path = None
     dbus_name = None
     debug_address = None
-    ibus_running = None
 
     doing_layout = None
     layoutname = None