summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-03 15:54:24 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-03 15:54:24 -0300
commita8c9810f5a90578c4dcce2f519e4d89be068f71a (patch)
tree4fcd3afc97cb3524392b064583158803de3a9967 /src/leap/bitmask/gui/mainwindow.py
parent0690de8d28a8bbb99e08a4c93837c843f8cda2f4 (diff)
parente05d074d5458bc3cce5519227c9971d4ffa09280 (diff)
Merge remote-tracking branch 'chiiph/bug/properly_enable_services' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 7129b670..dd4a341e 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -950,17 +950,22 @@ class MainWindow(QtGui.QMainWindow):
self._login_widget.logged_in()
+ self._enabled_services = self._settings.get_enabled_services(
+ self._provider_config.get_domain())
+
# TODO separate UI from logic.
# TODO soledad should check if we want to run only over EIP.
if self._provider_config.provides_mx() and \
self._enabled_services.count(self.MX_SERVICE) > 0:
self._mail_status.about_to_start()
- 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._soledad_bootstrapper.run_soledad_setup_checks(
+ self._provider_config,
+ self._login_widget.get_user(),
+ self._login_widget.get_password(),
+ download_if_needed=True)
+ else:
+ self._mail_status.set_disabled()
self._download_eip_config()