diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/controller.py ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/controller.py
--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/gui/controller.py	2014-01-17 00:34:52.000000000 +0700
+++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/gui/controller.py	2014-01-23 12:13:45.591824066 +0700
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 #
 # This file is part of ibus-bogo project.
 #
diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/ibus_engine.py ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/ibus_engine.py
--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/ibus_engine.py	2014-01-17 00:34:52.000000000 +0700
+++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/ibus_engine.py	2014-01-23 13:30:20.926315554 +0700
@@ -36,7 +36,7 @@ sys.path.append(
     os.path.abspath(os.path.join(ENGINE_PATH, "..")))
 
 import bogo
-from mouse_detector import MouseDetector
+#from mouse_detector import MouseDetector
 from keysyms_mapping import mapping
 import vncharsets
 
@@ -86,8 +86,8 @@ class Engine(IBus.Engine):
         self.reset_engine()
 
         # Create a new thread to detect mouse clicks
-        mouse_detector = MouseDetector.get_instance()
-        mouse_detector.add_mouse_click_listener(self.reset_engine)
+#        mouse_detector = MouseDetector.get_instance()
+#        mouse_detector.add_mouse_click_listener(self.reset_engine)
 
     # The "do_" part denotes a default signal handler
     def do_process_key_event(self, keyval, keycode, modifiers):
diff -rupN ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/main.py ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/main.py
--- ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d/ibus_engine/main.py	2014-01-17 00:34:52.000000000 +0700
+++ ibus-bogo-python-ce44b961de5a0f82a4a2d8fc0e487e8fcb29289d-new/ibus_engine/main.py	2014-01-23 13:33:10.437176769 +0700
@@ -30,7 +30,7 @@ import logging
 import argparse
 
 from ibus_engine import Engine
-from mouse_detector import MouseDetector
+#from mouse_detector import MouseDetector
 from config import Config
 from abbr import AbbreviationExpander
 
@@ -120,12 +120,13 @@ class IMApp:
             return engine
 
     def run(self):
-        mouse_detector = MouseDetector.get_instance()
-        mouse_detector.start()
+#        mouse_detector = MouseDetector.get_instance()
+#        mouse_detector.start()
         try:
             self.mainloop.run()
         finally:
-            mouse_detector.terminate()
+            pass
+#            mouse_detector.terminate()
 
     def bus_disconnected_cb(self, bus):
         self.mainloop.quit()