summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/mail
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-17 12:14:39 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-17 12:14:39 -0300
commiteb940b04bd2921974b094150a763ad8b9bbae8ca (patch)
tree2b867e3acaf8a86d431f2aeae9cf3dd57abf8e01 /src/leap/bitmask/services/mail
parentdcfaeea8c892ecb962080a1fbdc456bdfe851eea (diff)
parent1603228feac95c32b62661c15c6edd4c95978827 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/5506_use-pyside-slot-decorator' into develop
Diffstat (limited to 'src/leap/bitmask/services/mail')
-rw-r--r--src/leap/bitmask/services/mail/conductor.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index 79f324dc..c1761afa 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -238,12 +238,11 @@ class SMTPControl(object):
self._smtp_port.stopListening()
self._smtp_service.doStop()
- @QtCore.Slot()
+ @QtCore.Slot(dict)
def smtp_bootstrapped_stage(self, data):
"""
- SLOT
TRIGGERS:
- self.smtp_bootstrapper.download_config
+ self.smtp_bootstrapper.download_config
If there was a problem, displays it, otherwise it does nothing.
This is used for intermediate bootstrapping stages, in case