summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-05-08 10:53:50 -0300
committerTomás Touceda <chiiph@leap.se>2014-05-08 10:53:50 -0300
commit29d80e65eee5912151435115b3d76885211120e0 (patch)
tree832b2e3724f8c463f960c8a6d2a44ebb1f43594e /src/leap/bitmask/gui/mainwindow.py
parenta3d7f51327642faee4e261c9ba64084c789527dd (diff)
parent31c524e2abb98ca13ea993ebc2ec26e9f3d81975 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/cleanup-smtpbootstrapper' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index d66d518e..1a88fcce 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1412,13 +1412,9 @@ class MainWindow(QtGui.QMainWindow):
logger.debug("not starting smtp in offline mode")
return
- # TODO for simmetry, this should be called start_smtp_service
- # (and delegate all the checks to the conductor)
if self._provides_mx_and_enabled():
- self._mail_conductor.smtp_bootstrapper.run_smtp_setup_checks(
- self._provider_config,
- self._mail_conductor.smtp_config,
- download_if_needed=True)
+ self._mail_conductor.start_smtp_service(self._provider_config,
+ download_if_needed=True)
# XXX --- should remove from here, and connecte directly to the state
# machine.