Changeset 9847 for trunk/src/gajim.py

Timestamp:

06/27/08 01:37:12 (5 months ago)

Author:

bct

Message:

win.get_controls() isn't needed anymore

Files:

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

trunk/src/gajim.py

@@ -1035 +1035 @@
 
                 # show avatar in chat
-                ctrls = []
                 if resource and self.msg_win_mgr.has_window(fjid, account):
                         win = self.msg_win_mgr.get_window(fjid, account)
-                        ctrls = win.get_controls(fjid, account)
+                        ctrl = win.get_control(fjid, account)
                 elif self.msg_win_mgr.has_window(jid, account):
                         win = self.msg_win_mgr.get_window(jid, account)
-                        ctrls = win.get_controls(jid, account)
-
-                for ctrl in ctrls:
-                        if ctrl.type_id != message_control.TYPE_GC:
-                                ctrl.show_avatar()
+                        ctrl = win.get_control(jid, account)
+
+                if ctrl and ctrl.type_id != message_control.TYPE_GC:
+                        ctrl.show_avatar()
 
                 # Show avatar in roster or gc_roster
@@ -2606 +2604 @@
 
                         if win:
-                                ctrls = win.get_controls(fjid, account)
-                                if ctrls:
-                                        ctrl = ctrls[0]
+                                ctrl = win.get_control(fjid, account)
 
                 if not ctrl:
@@ -2621 +2617 @@
 
                 if gajim.connections[account].is_zeroconf and \
-                                gajim.connections[account].status in ('offline', 'invisible'):
-                        for ctrl in win.get_controls(fjid, account):
+                gajim.connections[account].status in ('offline', 'invisible'):
+                        ctrl = win.get_control(fjid, account)
+                        if ctrl:
                                 ctrl.got_disconnected()