summaryrefslogtreecommitdiff
path: root/src/leap/app.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-06-14 14:06:22 -0300
committerTomás Touceda <chiiph@leap.se>2013-06-14 14:06:22 -0300
commit625a2d672885f5c86b1908c0b5a147188a82bb5d (patch)
tree48c5b8f86c1543fdb10ec5d4f7488432bb18fd00 /src/leap/app.py
parent614bb802c11cee04de8a2e42c6666fa899ca0b33 (diff)
parentfdda95c92d22b4ede61bfb7587320ddb36da5cd7 (diff)
Merge remote-tracking branch 'kali/feature/terminate_openvpn_rev1' into develop
Diffstat (limited to 'src/leap/app.py')
-rw-r--r--src/leap/app.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/app.py b/src/leap/app.py
index 05b54d1f..cb9951c1 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -138,11 +138,14 @@ def main():
app.setApplicationName("leap")
app.setOrganizationDomain("leap.se")
+ # XXX ---------------------------------------------------------
+ # In quarantine, looks like we don't need it anymore.
# This dummy timer ensures that control is given to the outside
# loop, so we can hook our sigint handler.
- timer = QtCore.QTimer()
- timer.start(500)
- timer.timeout.connect(lambda: None)
+ #timer = QtCore.QTimer()
+ #timer.start(500)
+ #timer.timeout.connect(lambda: None)
+ # XXX ---------------------------------------------------------
window = MainWindow(
lambda: twisted_main.quit(app),