Author: bct Date: 2008-07-07 05:51:05 +0200 (Mon, 07 Jul 2008) New Revision: 9896

Modified: trunk/src/groupchat_control.py trunk/src/session.py Log: fix a couple of GC and PM TBs

Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-06 22:55:42 UTC (rev 9895) +++ trunk/src/groupchat_control.py 2008-07-07 03:51:05 UTC (rev 9896) @@ -2069,15 +2069,12 @@ gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) nick_jid = gc_c.get_full_jid()

- win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account) - if not win: - gajim.interface.new_private_chat(gc_c, self.account) - win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account) + ctrl = gajim.interface.msg_win_mgr.get_control(nick_jid, self.account) + if not ctrl: + ctrl = gajim.interface.new_private_chat(gc_c, self.account)

- ctrl = win.get_control(nick_jid, self.account) + ctrl.parent_win.set_active_tab(ctrl)

- win.set_active_tab(ctrl) - return ctrl

def on_row_activated(self, widget, path):

Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-07-06 22:55:42 UTC (rev 9895) +++ trunk/src/session.py 2008-07-07 03:51:05 UTC (rev 9896) @@ -175,8 +175,7 @@ jid_of_control = full_jid_with_resource

if not self.control: - # look for an existing chat control without a session - ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name) + ctrl = gajim.interface.msg_win_mgr.get_control(jid_of_control, self.conn.name) if ctrl: self.control = ctrl self.control.set_session(self)