summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-02-03 08:40:32 +0100
committermathieui <mathieui@mathieui.net>2014-02-03 08:40:32 +0100
commit20e5c69503acff7050132f73abae2657db27a3a8 (patch)
tree47b3263e82183bb7e84468ce7a77e06d93303ad6 /src
parentbf682651e0db9476a4ff24af80091453da43b216 (diff)
downloadpoezio-20e5c69503acff7050132f73abae2657db27a3a8.tar.gz
poezio-20e5c69503acff7050132f73abae2657db27a3a8.tar.bz2
poezio-20e5c69503acff7050132f73abae2657db27a3a8.tar.xz
poezio-20e5c69503acff7050132f73abae2657db27a3a8.zip
Do not unlock a tab when receiving a presence from the same resource
(makes OTR bug)
Diffstat (limited to 'src')
-rw-r--r--src/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index 169df31f..42ea5864 100644
--- a/src/core.py
+++ b/src/core.py
@@ -3443,7 +3443,7 @@ class Core(object):
jid = presence['from']
contact = roster[jid.bare]
tab = self.get_conversation_by_jid(jid, create=False)
- if isinstance(tab, tabs.DynamicConversationTab):
+ if isinstance(tab, tabs.DynamicConversationTab) and tab.get_dest_jid() != jid.full:
tab.unlock()
if contact is None:
return