summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-01-09 20:08:22 -0300
committerTomás Touceda <chiiph@leap.se>2014-01-09 20:08:22 -0300
commit8dc5ed97f10e01f92aea23439aa749c480a29a56 (patch)
tree26bc262a052a94eee74f6c7814c1bb7f303873bc
parent51392198f87a271ddc0080370cc8b6b203774123 (diff)
parent50438b189c21d984d5697b0532a8960feaecdcb2 (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/close_imap_session' into develop
-rw-r--r--changes/VERSION_COMPAT1
-rw-r--r--changes/bug_4925_close_imap_session1
-rw-r--r--src/leap/bitmask/services/mail/conductor.py1
3 files changed, 3 insertions, 0 deletions
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
index cc00ecf7..1f523ccd 100644
--- a/changes/VERSION_COMPAT
+++ b/changes/VERSION_COMPAT
@@ -8,3 +8,4 @@
#
# BEGIN DEPENDENCY LIST -------------------------
# leap.foo.bar>=x.y.z
+leap.mail>=0.3.9
diff --git a/changes/bug_4925_close_imap_session b/changes/bug_4925_close_imap_session
new file mode 100644
index 00000000..f70b3e2b
--- /dev/null
+++ b/changes/bug_4925_close_imap_session
@@ -0,0 +1 @@
+- Properly reset imap session on logout. Closes: #4925
diff --git a/src/leap/bitmask/services/mail/conductor.py b/src/leap/bitmask/services/mail/conductor.py
index addf9bef..875b98ea 100644
--- a/src/leap/bitmask/services/mail/conductor.py
+++ b/src/leap/bitmask/services/mail/conductor.py
@@ -102,6 +102,7 @@ class IMAPControl(object):
# Stop listening on the IMAP port
self.imap_port.stopListening()
# Stop the protocol
+ self.imap_factory.theAccount.closed = True
self.imap_factory.doStop()
def fetch_incoming_mail(self):