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

fix some resource problems. see #3799

This commit is contained in:
Yann Leboulanger 2008-08-12 08:53:09 +00:00
parent cdffa94641
commit d2669df77b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chat_control.py
View File

@ -1144,6 +1144,12 @@ class ChatControl(ChatControlBase):
if not session: if not session:
session = gajim.connections[self.account]. \ session = gajim.connections[self.account]. \
find_controlless_session(self.contact.jid) find_controlless_session(self.contact.jid)
if session:
# Don't use previous session if we want to a specific resource
# and it's not the same
j, r = gajim.get_room_and_nick_from_fjid(str(session.jid))
if resource and resource != r:
session = None
if session: if session:
session.control = self session.control = self

2
src/gajim.py
View File

@ -2670,7 +2670,7 @@ class Interface:
mw = self.msg_win_mgr.get_window(fjid, account) mw = self.msg_win_mgr.get_window(fjid, account)
if not mw: if not mw:
mw = self.msg_win_mgr.create_window(contact, account, type_) mw = self.msg_win_mgr.create_window(contact, account, type_, resource)
chat_control = ChatControl(mw, contact, account, session, resource) chat_control = ChatControl(mw, contact, account, session, resource)