Changeset 9896

Timestamp:

07/07/08 05:51:05 (5 months ago)

Author:

bct

Message:

fix a couple of GC and PM TBs

Location:

trunk/src

Files:

• groupchat_control.py (modified) (1 diff)
• session.py (modified) (1 diff)

trunk/src/groupchat_control.py

@@ -2070 +2070 @@
                 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 = win.get_control(nick_jid, self.account)
-
-                win.set_active_tab(ctrl)
+                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.parent_win.set_active_tab(ctrl)
 
                 return ctrl

trunk/src/session.py

@@ -176 +176 @@
 
                 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