diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-08 11:01:31 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-08 11:01:31 -0300 |
| commit | 60cca5cd7c2fc1e3d2a6b7e4d5e4bc9599f6539f (patch) | |
| tree | 75f719841e270cfa16bd8f37e3c641d0c3c66501 /src/leap/gui/mainwindow.py | |
| parent | 7c3ff09938c382a482c5b3049bee6c1c5c5f04a3 (diff) | |
| parent | 03ebed92556e965d5bc39b256e77cf9cf18fb11b (diff) | |
Merge remote-tracking branch 'kali/feature/openvpn_verbosity' into develop
Diffstat (limited to 'src/leap/gui/mainwindow.py')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 6b31fb6c..130437bf 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -99,7 +99,9 @@ class MainWindow(QtGui.QMainWindow): user_stopped_eip = False def __init__(self, quit_callback, - standalone=False, bypass_checks=False): + standalone=False, + openvpn_verb=1, + bypass_checks=False): """ Constructor for the client main window @@ -210,7 +212,7 @@ class MainWindow(QtGui.QMainWindow): self._smtp_bootstrapper.download_config.connect( self._smtp_bootstrapped_stage) - self._vpn = VPN() + self._vpn = VPN(openvpn_verb=openvpn_verb) self._vpn.qtsigs.state_changed.connect( self._status_panel.update_vpn_state) self._vpn.qtsigs.status_changed.connect( @@ -1066,6 +1068,7 @@ class MainWindow(QtGui.QMainWindow): self._status_panel.eip_started() + # XXX refactor into status_panel method? self._action_eip_startstop.setText(self.tr("Turn OFF")) self._action_eip_startstop.disconnect(self) self._action_eip_startstop.triggered.connect( |