summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-11-07 09:42:09 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-11-07 09:42:09 -0300
commita3ab08d4582c4657b759a1d9cc9398edb2e53697 (patch)
tree28b24e85b147fe425268ceada978305642a21675 /src/leap
parentc84b997124ea08338363c7b2b95747e30bf9e498 (diff)
parent3237573421a5bfc2368878e324f030f0d7f3a3bb (diff)
Merge remote-tracking branch 'chiiph/bug/reject_bad_senders' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
-rw-r--r--src/leap/bitmask/services/mail/conductor.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index a91f4e71..91bbe9cb 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -915,7 +915,6 @@ class MainWindow(QtGui.QMainWindow):
user = self._logged_user
domain = self._provider_config.get_domain()
userid = "%s@%s" % (user, domain)
- logger.debug("USERID: " % userid)
self._mail_conductor.userid = userid
self._login_defer = None
self._start_eip_bootstrap()
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index 4d34a13b..6dcf0c6f 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -200,6 +200,7 @@ class SMTPControl(object):
from leap.mail.smtp import setup_smtp_relay
self._smtp_service, self._smtp_port = setup_smtp_relay(
port=2013,
+ userid=self.userid,
keymanager=self._keymanager,
smtp_host=host,
smtp_port=port,
@@ -345,7 +346,7 @@ class MailConductor(IMAPControl, SMTPControl):
return self._userid
@userid.setter
- def _userid(self, userid):
+ def userid(self, userid):
"""
Sets the user id this conductor is configured for.