copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Find correct contact on private message

Browse source 
get_contact() returns also a contact if only the bare jid matches,
which for private messages is the groupchat contact object.
This commit is contained in:
Philipp Hörist 2018-12-09 00:01:18 +01:00
parent 1c09b50791
commit 5af7967127
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gajim/session.py
View file

@ -79,11 +79,13 @@ class ChatControlSession:
"""
if obj.session != self:
return
contact = app.contacts.get_contact(self.conn.name, obj.jid,
obj.resource)
if not contact:
contact = app.contacts.get_gc_contact(self.conn.name, obj.jid,
obj.resource)
if obj.muc_pm:
contact = app.contacts.get_gc_contact(
self.conn.name, obj.jid, obj.resource)
else:
contact = app.contacts.get_contact(
self.conn.name, obj.jid, obj.resource)
if self.resource != obj.resource:
self.resource = obj.resource
if self.control: