changeset 0fc2a9403a8a in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0fc2a9403a8a description: update contact instance in chat window when we talk to another resource. Fixes #7700

diffstat:

src/common/connection.py | 5 +++-- src/session.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/common/connection.py --- a/src/common/connection.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/common/connection.py Fri Mar 28 21:29:42 2014 +0100 @@ -464,8 +464,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - if resource: - contact = gajim.contacts.get_contact(self.name, jid, resource) + r_ = resource or gajim.get_resource_from_jid(fjid) + if r_: + contact = gajim.contacts.get_contact(self.name, jid, r_) else: contact = gajim.contacts.get_contact_with_highest_priority( self.name, jid) diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/session.py --- a/src/session.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/session.py Fri Mar 28 21:29:42 2014 +0100 @@ -160,6 +160,7 @@ if ctrl: self.control = ctrl self.control.set_session(self) + self.control.contact = contact

if not pm: self.roster_message2(obj)