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

update contact instance in chat window when we talk to another resource. Fixes #7700

This commit is contained in:
Yann Leboulanger 2014-03-28 21:29:42 +01:00
parent 7d09c4d45b
commit ea30b6888b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection.py
View File

@ -463,8 +463,9 @@ class CommonConnection:
msg_iq = iqs msg_iq = iqs
else: else:
msg_iq.setTo(fjid) msg_iq.setTo(fjid)
if resource: r_ = resource or gajim.get_resource_from_jid(fjid)
contact = gajim.contacts.get_contact(self.name, jid, resource) if r_:
contact = gajim.contacts.get_contact(self.name, jid, r_)
else: else:
contact = gajim.contacts.get_contact_with_highest_priority( contact = gajim.contacts.get_contact_with_highest_priority(
self.name, jid) self.name, jid)

1
src/session.py
View File

@ -160,6 +160,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
if ctrl: if ctrl:
self.control = ctrl self.control = ctrl
self.control.set_session(self) self.control.set_session(self)
self.control.contact = contact
if not pm: if not pm:
self.roster_message2(obj) self.roster_message2(obj)