Merge remote-tracking branch 'kali/feature/terminate_openvpn_rev1' into develop

1 files changed, 22 insertions, 18 deletions

diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 80876c27..51b96463 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -185,11 +185,11 @@ class MainWindow(QtGui.QMainWindow):
         self._eip_bootstrapper.download_client_certificate.connect(
             self._finish_eip_bootstrap)
 
-        self._soledad_bootstrapper = SoledadBootstrapper()
-        self._soledad_bootstrapper.download_config.connect(
-            self._soledad_intermediate_stage)
-        self._soledad_bootstrapper.gen_key.connect(
-            self._soledad_bootstrapped_stage)
+        #self._soledad_bootstrapper = SoledadBootstrapper()
+        #self._soledad_bootstrapper.download_config.connect(
+            #self._soledad_intermediate_stage)
+        #self._soledad_bootstrapper.gen_key.connect(
+            #self._soledad_bootstrapped_stage)
 
         self._smtp_bootstrapper = SMTPBootstrapper()
         self._smtp_bootstrapper.download_config.connect(
@@ -808,11 +808,12 @@ class MainWindow(QtGui.QMainWindow):
 
         self.ui.stackedWidget.setCurrentIndex(self.EIP_STATUS_INDEX)
 
-        self._soledad_bootstrapper.run_soledad_setup_checks(
-            self._provider_config,
-            self._login_widget.get_user(),
-            self._login_widget.get_password(),
-            download_if_needed=True)
+        # XXX disabling soledad for now
+        #self._soledad_bootstrapper.run_soledad_setup_checks(
+            #self._provider_config,
+            #self._login_widget.get_user(),
+            #self._login_widget.get_password(),
+            #download_if_needed=True)
 
         self._download_eip_config()
 
@@ -992,19 +993,21 @@ class MainWindow(QtGui.QMainWindow):
         self._status_panel.set_startstop_enabled(True)
 
     def _stop_eip(self):
+        """
+        Stops vpn process and makes gui adjustments to reflect
+        the change of state.
+        """
         self._vpn.terminate()
+
         self._status_panel.set_eip_status(self.tr("Off"))
         self._status_panel.set_eip_status_icon("error")
-
         self._status_panel.eip_stopped()
-
         self._action_eip_startstop.setText(self.tr("Turn ON"))
         self._action_eip_startstop.disconnect(self)
         self._action_eip_startstop.triggered.connect(
             self._start_eip)
         self._already_started_eip = False
         self._settings.set_defaultprovider(None)
-
         if self._logged_user:
             self._status_panel.set_provider(
                 "%s@%s" % (self._logged_user,
@@ -1202,12 +1205,12 @@ class MainWindow(QtGui.QMainWindow):
         """
         logger.debug('About to quit, doing cleanup...')
 
-        logger.debug('Killing vpn')
-        self._vpn.terminate()
-
         logger.debug('Cleaning pidfiles')
         self._cleanup_pidfiles()
 
+        logger.debug('Terminating vpn')
+        self._vpn.terminate()
+
     def quit(self):
         """
         Cleanup and tidely close the main window before quitting.
@@ -1221,13 +1224,14 @@ class MainWindow(QtGui.QMainWindow):
         if self._logger_window:
             self._logger_window.close()
 
-        self.close()
-
         if self._login_defer:
             self._login_defer.cancel()
 
+        self.close()
+
         if self._quit_callback:
             self._quit_callback()
+
         logger.debug('Bye.')