diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2014-09-09 10:52:01 -0500 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2014-09-09 10:52:01 -0500 |
| commit | 2b699c381a396938250c782c62ff96f035c3b8a8 (patch) | |
| tree | 53fdbc6e74e331bad9b937a9c579869e6534e0ba /src | |
| parent | 7e84a21a837b8d3f1ce72bc349ab966ef80ed1a2 (diff) | |
| parent | ad568dd45ead0b87e09a26fc7f5bf0c6c5a63324 (diff) | |
Merge branch 'kali/feature/return-deferred' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/mail/imap/mailbox.py | 2 | ||||
| -rw-r--r-- | src/leap/mail/smtp/gateway.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py index aa2a300..34cf535 100644 --- a/src/leap/mail/imap/mailbox.py +++ b/src/leap/mail/imap/mailbox.py @@ -459,6 +459,8 @@ class SoledadMailbox(WithMsgFields, MBoxParser): notify_on_disk=notify_on_disk) if PROFILE_CMD: do_profile_cmd(d, "APPEND") + + # XXX should review now that we're not using qtreactor. # A better place for this would be the COPY/APPEND dispatcher # in server.py, but qtreactor hangs when I do that, so this seems # to work fine for now. diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py index ef398d1..13d3bbf 100644 --- a/src/leap/mail/smtp/gateway.py +++ b/src/leap/mail/smtp/gateway.py @@ -463,13 +463,13 @@ class EncryptedMessage(object): """ Sends the message. - :return: A deferred with callbacks for error and success of this - #message send. + :return: A deferred with callback and errback for + this #message send. :rtype: twisted.internet.defer.Deferred """ d = deferToThread(self._route_msg) d.addCallbacks(self.sendQueued, self.sendError) - return + return d def _route_msg(self): """ |