summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-11 12:08:41 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-11 12:08:41 -0300
commit1ca98f26d99477476013c4e91b13e88e8bcfbe05 (patch)
treef9eb963b52bb25d15f544159f3346aadebe31470 /src/leap
parent7b3bf9ecf9e5afb0321777846638ef0c9b3e339c (diff)
parent59868c95c23e825544b2c986bf7fe6c15538bbe5 (diff)
Merge remote-tracking branch 'drebs/change-smtp-relay-to-gateway' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/services/mail/conductor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index 6dcf0c6f..a9621b13 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -197,8 +197,8 @@ class SMTPControl(object):
# TODO remove hard-coded port and let leap.mail set
# the specific default.
self.smtp_connection.qtsigs.connecting_signal.emit()
- from leap.mail.smtp import setup_smtp_relay
- self._smtp_service, self._smtp_port = setup_smtp_relay(
+ from leap.mail.smtp import setup_smtp_gateway
+ self._smtp_service, self._smtp_port = setup_smtp_gateway(
port=2013,
userid=self.userid,
keymanager=self._keymanager,