From 469a056387fa1d69dd14f0680fa0026e0a3ff80c Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 2 Apr 2014 16:29:29 -0300 Subject: Do not start soledad if its not provided and enabled. [Closes #5411] --- changes/bug-5411_mail-is-not-disabled-at-first-start | 1 + src/leap/bitmask/gui/mainwindow.py | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changes/bug-5411_mail-is-not-disabled-at-first-start diff --git a/changes/bug-5411_mail-is-not-disabled-at-first-start b/changes/bug-5411_mail-is-not-disabled-at-first-start new file mode 100644 index 00000000..3cba7a01 --- /dev/null +++ b/changes/bug-5411_mail-is-not-disabled-at-first-start @@ -0,0 +1 @@ +- Do not start soledad and mail if the mail service is disabled. Closes #5411. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index feb1e18b..04a98fac 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1230,6 +1230,9 @@ class MainWindow(QtGui.QMainWindow): if self._already_started_soledad is True: return + if not self._provides_mx_and_enabled(): + return + username = self._login_widget.get_user() password = unicode(self._login_widget.get_password()) provider_domain = self._login_widget.get_selected_provider() -- cgit v1.2.3