From 85e5bb0279b47982b535a2711c156d61a9ee235e Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 9 Sep 2014 10:18:09 -0500
Subject: return the deferred from sendMessage

in this way we allow to add more callbacks
to the chain.
---
 mail/src/leap/mail/smtp/gateway.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py
index ef398d1..13d3bbf 100644
--- a/mail/src/leap/mail/smtp/gateway.py
+++ b/mail/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):
         """
-- 
cgit v1.2.3


From 68ec6b1b9de22a58e1a7720a33c334f1a85cb01d Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 9 Sep 2014 10:18:42 -0500
Subject: fix README syntax

---
 mail/README.rst | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'mail')

diff --git a/mail/README.rst b/mail/README.rst
index f758a66..df75218 100644
--- a/mail/README.rst
+++ b/mail/README.rst
@@ -11,17 +11,11 @@ More info: https://leap.se
 running tests
 -------------
 
-Use trial to run the test suite.
-
-```
-trial leap.mail
-```
+Use trial to run the test suite::
+  trial leap.mail
 
 ... and all its goodies. To run all imap tests in a loop until some of them
-fails:
-
-```
-trial -u leap.mail.imap
-```
+fails::
+  trial -u leap.mail.imap
 
 Read the *trial* manpage for more options .
-- 
cgit v1.2.3


From aea236ee3b9467bc6754f5a10ccda4c78e6bd66d Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Tue, 9 Sep 2014 10:18:50 -0500
Subject: add comment

---
 mail/src/leap/mail/imap/mailbox.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mail')

diff --git a/mail/src/leap/mail/imap/mailbox.py b/mail/src/leap/mail/imap/mailbox.py
index aa2a300..34cf535 100644
--- a/mail/src/leap/mail/imap/mailbox.py
+++ b/mail/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.
-- 
cgit v1.2.3