summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-06-29 23:49:11 +0200
committermathieui <mathieui@mathieui.net>2015-06-29 23:49:11 +0200
commitbe9f447099cbe8d0d3aef268c9aa3fe1e871921b (patch)
treed254991e733bc0a52f59572d5b8034f7161867ed
parent7c99b826420475c0f5cffc3479bcc80bdf309a6c (diff)
downloadpoezio-be9f447099cbe8d0d3aef268c9aa3fe1e871921b.tar.gz
poezio-be9f447099cbe8d0d3aef268c9aa3fe1e871921b.tar.bz2
poezio-be9f447099cbe8d0d3aef268c9aa3fe1e871921b.tar.xz
poezio-be9f447099cbe8d0d3aef268c9aa3fe1e871921b.zip
Make /otr end terminate all encrypted conversations with this bare JID
-rw-r--r--plugins/otr.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/otr.py b/plugins/otr.py
index cef6d7d4..c9fc50d9 100644
--- a/plugins/otr.py
+++ b/plugins/otr.py
@@ -822,10 +822,11 @@ class Plugin(BasePlugin):
if action == 'end': # close the session
context = self.get_context(name)
context.disconnect()
- if isinstance(tab, DynamicConversationTab) and not tab.locked_resource:
+ if isinstance(tab, DynamicConversationTab):
ctx = self.find_encrypted_context_with_matching(safeJID(name).bare)
- if ctx is not None:
+ while ctx is not None:
ctx.disconnect()
+ ctx = self.find_encrypted_context_with_matching(safeJID(name).bare)
elif action == 'start' or action == 'refresh':
self.otr_start(tab, name, format_dict)
elif action == 'ourfpr':