Merge remote-tracking branch 'chiiph/feature/remove_qtreactor' into develop

1 files changed, 6 insertions, 11 deletions

diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index 1146d1d0..a1f3a69f 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -58,6 +58,9 @@ from leap.bitmask.services.mail import plumber
 from leap.common.events import server as event_server
 from leap.mail import __version__ as MAIL_VERSION
 
+from twisted.internet import reactor
+from twisted.internet.task import LoopingCall
+
 import codecs
 codecs.register(lambda name: codecs.lookup('utf-8')
                 if name == 'cp65001' else None)
@@ -74,12 +77,6 @@ def sigint_handler(*args, **kwargs):
     mainwindow.quit()
 
 
-def install_qtreactor(logger):
-    import qt4reactor
-    qt4reactor.install()
-    logger.debug("Qt4 reactor installed")
-
-
 def add_logger_handlers(debug=False, logfile=None, replace_stdout=True):
     """
     Create the logger and attach the handlers.
@@ -274,9 +271,6 @@ def main():
 
     app = QtGui.QApplication(sys.argv)
 
-    # install the qt4reactor.
-    install_qtreactor(logger)
-
     # To test:
     # $ LANG=es ./app.py
     locale = QtCore.QLocale.system().name()
@@ -319,8 +313,9 @@ def main():
     #tx_app = leap_services()
     #assert(tx_app)
 
-    # Run main loop
-    twisted_main.start(app)
+    l = LoopingCall(QtCore.QCoreApplication.processEvents, 0, 10)
+    l.start(0.01)
+    reactor.run()
 
 if __name__ == "__main__":
     main()