summaryrefslogtreecommitdiff
path: root/src/leap/baseapp
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-21 04:58:05 +0900
committerkali <kali@leap.se>2012-08-21 05:00:53 +0900
commit738b4bf8c6b75a1d73b7fa3e1a5edb69adf9d8a0 (patch)
tree9870139b5fcb5866a2e50c118498e2380276bce4 /src/leap/baseapp
parentbb7c03a2d7244beff71ae610c012f525496daeb9 (diff)
fix out-of-sync refactor.
manually merge changes from the develop branch that were lost due to having branched a previous state when refactored former "conductor" class. also, moved more exceptions to its own file.
Diffstat (limited to 'src/leap/baseapp')
-rw-r--r--src/leap/baseapp/mainwindow.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 4d1eee79..c5bdd8e9 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -12,14 +12,14 @@ from PyQt4.QtGui import (QMainWindow, QWidget, QVBoxLayout, QMessageBox,
from PyQt4.QtCore import (pyqtSlot, pyqtSignal, QTimer)
from leap.baseapp.dialogs import ErrorDialog
-from leap.eip.conductor import (EIPConductor,
- EIPNoCommandError)
-from leap.eip.config import (EIPInitBadKeyFilePermError)
-# from leap.eip import exceptions as eip_exceptions
+#from leap.eip.conductor import (EIPConductor,
+ #EIPNoCommandError)
+#from leap.eip.config import (EIPInitBadKeyFilePermError)
+from leap.eip import exceptions as eip_exceptions
+from leap.eip.eipconnection import EIPConnection
from leap.gui import mainwindow_rc
-from leap.eip.eipconnection import EIPConnection
class LeapWindow(QMainWindow):
@@ -380,7 +380,7 @@ technolust</i>")
if self.vpn_service_started is False:
try:
self.conductor.connect()
- except EIPNoCommandError:
+ except eip_exceptions.EIPNoCommandError:
dialog = ErrorDialog()
dialog.warningMessage(
'No suitable openvpn command found. '