Changeset 9846 for trunk/src/roster_window.py

Timestamp:

06/27/08 01:36:58 (5 months ago)

Author:

bct

Message:

first pass at stripping out the one-tab-per-session code

Files:

• trunk/src/roster_window.py (modified) (3 diffs)

trunk/src/roster_window.py

@@ -1518 +1518 @@
                         # If we already have chat windows opened, update them with new contact
                         # instance
-                        for chat_control in gajim.interface.msg_win_mgr.get_chat_controls(ji,
-                        account):
+                        chat_control = gajim.interface.msg_win_mgr.get_control(ji, account)
+                        if chat_control:
                                 chat_control.contact = contact1
 
@@ -2582 +2582 @@
                         keys[contact.jid] = keyID
 
-                for ctrl in gajim.interface.msg_win_mgr.get_chat_controls(contact.jid,
-                account):
+                ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
+                if ctrl:
                         ctrl.update_ui()
+
                 keys_str = ''
                 for jid in keys:
@@ -3940 +3941 @@
                 self.draw_avatar(jid, account)
                 # Update chat window
-                if gajim.interface.msg_win_mgr.has_window(jid, account):
-                        win = gajim.interface.msg_win_mgr.get_window(jid, account)
-                        for ctrl in win.get_chat_controls(jid, account):
-                                if win and ctrl.type_id != message_control.TYPE_GC:
-                                        ctrl.show_avatar()
+
+                ctrl = gajim.interface.msg_win_mgr.get_control(jid, account)
+                if ctrl and ctrl.type_id != message_control.TYPE_GC:
+                        ctrl.show_avatar()
 
         def on_roster_treeview_style_set(self, treeview, style):