From 37577fdf037f2987ae3eb9493457dd8d4447aaf7 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 14 Apr 2014 15:35:16 -0300
Subject: Use less confusing signal names.

Renames:
eip_download_config -> eip_config_ready
eip_download_client_certificate -> eip_client_certificate_ready
---
 src/leap/bitmask/backend.py                      | 14 ++++++--------
 src/leap/bitmask/gui/mainwindow.py               | 10 +++++-----
 src/leap/bitmask/services/eip/eipbootstrapper.py |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py
index 3d238626..c71553a3 100644
--- a/src/leap/bitmask/backend.py
+++ b/src/leap/bitmask/backend.py
@@ -596,8 +596,8 @@ class Signaler(QtCore.QObject):
     srp_registration_taken = QtCore.Signal(object)
 
     # Signals for EIP bootstrapping
-    eip_download_config = QtCore.Signal(object)
-    eip_download_client_certificate = QtCore.Signal(object)
+    eip_config_ready = QtCore.Signal(object)
+    eip_client_certificate_ready = QtCore.Signal(object)
 
     eip_cancelled_setup = QtCore.Signal(object)
 
@@ -683,10 +683,8 @@ class Signaler(QtCore.QObject):
     SRP_STATUS_LOGGED_IN = "srp_status_logged_in"
     SRP_STATUS_NOT_LOGGED_IN = "srp_status_not_logged_in"
 
-    # TODO change the name of "download_config" signal to
-    # something less confusing (config_ready maybe)
-    EIP_DOWNLOAD_CONFIG = "eip_download_config"
-    EIP_DOWNLOAD_CLIENT_CERTIFICATE = "eip_download_client_certificate"
+    EIP_CONFIG_READY = "eip_config_ready"
+    EIP_CLIENT_CERTIFICATE_READY = "eip_client_certificate_ready"
     EIP_CANCELLED_SETUP = "eip_cancelled_setup"
 
     EIP_CONNECTED = "eip_connected"
@@ -739,8 +737,8 @@ class Signaler(QtCore.QObject):
             self.SRP_REGISTRATION_FAILED,
             self.SRP_REGISTRATION_TAKEN,
 
-            self.EIP_DOWNLOAD_CONFIG,
-            self.EIP_DOWNLOAD_CLIENT_CERTIFICATE,
+            self.EIP_CONFIG_READY,
+            self.EIP_CLIENT_CERTIFICATE_READY,
             self.EIP_CANCELLED_SETUP,
 
             self.EIP_CONNECTED,
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index fb37f102..e5c11eb7 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -412,9 +412,9 @@ class MainWindow(QtGui.QMainWindow):
                                 self._not_logged_in_error)
 
         # EIP bootstrap signals
-        self._connect_and_track(sig.eip_download_config,
+        self._connect_and_track(sig.eip_config_ready,
                                 self._eip_intermediate_stage)
-        self._connect_and_track(sig.eip_download_client_certificate,
+        self._connect_and_track(sig.eip_client_certificate_ready,
                                 self._finish_eip_bootstrap)
 
         # We don't want to disconnect some signals so don't track them:
@@ -1825,7 +1825,7 @@ class MainWindow(QtGui.QMainWindow):
     def _finish_eip_bootstrap(self, data):
         """
         SLOT
-        TRIGGER: self._backend.signaler.eip_download_client_certificate
+        TRIGGER: self._backend.signaler.eip_client_certificate_ready
 
         Starts the VPN thread if the eip configuration is properly
         loaded
@@ -1847,7 +1847,7 @@ class MainWindow(QtGui.QMainWindow):
         """
         SLOT
         TRIGGERS:
-          self._backend.signaler.eip_download_config
+          self._backend.signaler.eip_config_ready
 
         If there was a problem, displays it, otherwise it does nothing.
         This is used for intermediate bootstrapping stages, in case
@@ -1942,7 +1942,7 @@ class MainWindow(QtGui.QMainWindow):
           self._backend.signaler.prov_name_resolution
           self._backend.signaler.prov_https_connection
           self._backend.signaler.prov_download_ca_cert
-          self._backend.signaler.eip_download_config
+          self._backend.signaler.eip_config_ready
 
         If there was a problem, displays it, otherwise it does nothing.
         This is used for intermediate bootstrapping stages, in case
diff --git a/src/leap/bitmask/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py
index aacf3b7e..c77977ce 100644
--- a/src/leap/bitmask/services/eip/eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/eipbootstrapper.py
@@ -116,9 +116,9 @@ class EIPBootstrapper(AbstractBootstrapper):
         self._download_if_needed = download_if_needed
 
         cb_chain = [
-            (self._download_config, self._signaler.EIP_DOWNLOAD_CONFIG),
+            (self._download_config, self._signaler.EIP_CONFIG_READY),
             (self._download_client_certificates,
-             self._signaler.EIP_DOWNLOAD_CLIENT_CERTIFICATE)
+             self._signaler.EIP_CLIENT_CERTIFICATE_READY)
         ]
 
         return self.addCallbackChain(cb_chain)
-- 
cgit v1.2.3