Merge remote-tracking branch 'kali/bug/hide-mx' into develop

2 files changed, 10 insertions, 2 deletions

diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index a3c601c5..2ed01917 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -110,10 +110,14 @@ class MainWindow(QtGui.QMainWindow):
         QtGui.QMainWindow.__init__(self)
 
         # register leap events
+
+        # XXX ------- this is blocking -----------
         register(signal=proto.UPDATER_NEW_UPDATES,
                  callback=self._new_updates_available)
         register(signal=proto.RAISE_WINDOW,
                  callback=self._on_raise_window_event)
+        # XXX ------- this is blocking -----------
+
         self._quit_callback = quit_callback
 
         self._updates_content = ""
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py
index 897bf94f..066a7db3 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/gui/wizard.py
@@ -32,6 +32,7 @@ from leap.crypto.srpregister import SRPRegister
 from leap.util.privilege_policies import is_missing_policy_permissions
 from leap.util.request_helpers import get_content
 from leap.services.eip.providerbootstrapper import ProviderBootstrapper
+from leap.services import get_available
 
 logger = logging.getLogger(__name__)
 
@@ -514,13 +515,16 @@ class Wizard(QtGui.QWizard):
     def _populate_services(self):
         """
         Loads the services that the provider provides into the UI for
-        the user to enable or disable
+        the user to enable or disable.
         """
         self.ui.grpServices.setTitle(
             self.tr("Services by %s") %
             (self._provider_config.get_name(),))
 
-        for service in self._provider_config.get_services():
+        services = get_available(
+            self._provider_config.get_services())
+
+        for service in services:
             try:
                 if service not in self._shown_services:
                     checkbox = QtGui.QCheckBox(self)