diff options
| author | Kali Kaneko <kali@leap.se> | 2015-09-23 11:45:58 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-09-23 11:45:58 -0400 |
| commit | befb26bdaeca5bfe4df60f13f32d49d763af6121 (patch) | |
| tree | 6de657567c5928c56cb615e39065dc977da69d73 /src/leap/mail/outgoing/service.py | |
| parent | 04baa4e421d22b02b259284c3f119d8480a989fa (diff) | |
| parent | de07e19f81207084e102801febeaf96680ce5d8a (diff) | |
Merge remote-tracking branch 'leapcode/pr/206' into develop
Diffstat (limited to 'src/leap/mail/outgoing/service.py')
| -rw-r--r-- | src/leap/mail/outgoing/service.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/mail/outgoing/service.py b/src/leap/mail/outgoing/service.py index 3708f33..3754650 100644 --- a/src/leap/mail/outgoing/service.py +++ b/src/leap/mail/outgoing/service.py @@ -241,7 +241,7 @@ class OutgoingMail: def signal_encrypt_sign(newmsg): emit_async(catalog.SMTP_END_ENCRYPT_AND_SIGN, - "%s,%s" % (self._from_address, to_address)) + "%s,%s" % (self._from_address, to_address)) return newmsg, recipient def if_key_not_found_send_unencrypted(failure, message): @@ -260,7 +260,7 @@ class OutgoingMail: log.msg("Will encrypt the message with %s and sign with %s." % (to_address, from_address)) emit_async(catalog.SMTP_START_ENCRYPT_AND_SIGN, - "%s,%s" % (self._from_address, to_address)) + "%s,%s" % (self._from_address, to_address)) d = self._maybe_attach_key(origmsg, from_address, to_address) d.addCallback(maybe_encrypt_and_sign) return d |