Author: asterix Date: 2008-08-12 10:53:09 +0200 (Tue, 12 Aug 2008) New Revision: 10209

Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: fix some resource problems. see #3799

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-12 08:17:02 UTC (rev 10208) +++ trunk/src/chat_control.py 2008-08-12 08:53:09 UTC (rev 10209) @@ -1144,6 +1144,12 @@ if not session: session = gajim.connections[self.account]. \ 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: session.control = self

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-12 08:17:02 UTC (rev 10208) +++ trunk/src/gajim.py 2008-08-12 08:53:09 UTC (rev 10209) @@ -2670,7 +2670,7 @@

mw = self.msg_win_mgr.get_window(fjid, account) 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)