From b70a6664f0603297bf8b20809b5a64677900b405 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 11 Oct 2012 08:23:22 +0900
Subject: add signal to end of eip checks

this fixes random error on leap initialization
---
 src/leap/baseapp/eip.py        | 4 +---
 src/leap/baseapp/mainwindow.py | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/leap/baseapp')

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index b67e4444..93dce3ac 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -55,9 +55,7 @@ class EIPConductorAppMixin(object):
             skip_verify=self.skip_verify)
         self.error_check()
 
-        # XXX should send ready signal instead
-        if self.conductor.autostart:
-            self.start_or_stopVPN()
+        self.start_eipconnection.emit()
 
     def error_check(self):
         """
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 87886767..3b6cb544 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -33,6 +33,7 @@ class LeapWindow(QtGui.QMainWindow,
     initReady = QtCore.pyqtSignal([])
     networkError = QtCore.pyqtSignal([object])
     triggerEIPError = QtCore.pyqtSignal([object])
+    start_eipconnection = QtCore.pyqtSignal([])
 
     # XXX fix nomenclature here
     # this is eip status change got from vpn management
@@ -80,6 +81,8 @@ class LeapWindow(QtGui.QMainWindow,
         if self.debugmode:
             self.startStopButton.clicked.connect(
                 lambda: self.start_or_stopVPN())
+        self.start_eipconnection.connect(
+            lambda: self.start_or_stopVPN())
 
         # status change.
         # TODO unify
-- 
cgit v1.2.3