Changeset 9847

Timestamp:

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

Author:

bct

Message:

win.get_controls() isn't needed anymore

Location:

trunk/src

Files:

• gajim.py (modified) (3 diffs)
• groupchat_control.py (modified) (1 diff)
• message_window.py (modified) (1 diff)
• roster_window.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()
 

trunk/src/groupchat_control.py

@@ -2077 +2077 @@
                         win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account)
 
-                ctrl = win.get_controls(nick_jid, self.account)[0]
+                ctrl = win.get_control(nick_jid, self.account)
 
                 win.set_active_tab(ctrl)

trunk/src/message_window.py

@@ -586 +586 @@
         def has_control(self, jid, acct):
                 return (acct in self._controls and jid in self._controls[acct])
-
-        def get_controls(self, jid, acct):
-                try:
-                        return self._controls[acct][jid]
-                except KeyError:
-                        return []
 
         def change_key(self, old_jid, new_jid, acct):

trunk/src/roster_window.py

@@ -1813 +1813 @@
                         if contact.resource != '':
                                 name += '/' + contact.resource
-                        
+
                         # Remove resource when going offline
                         if show in ('offline', 'error') and \
@@ -1822 +1822 @@
                                         win = gajim.interface.msg_win_mgr.get_window(jid_with_resource,
                                                 account)
-                                        for ctrl in win.get_controls(jid_with_resource, account):
+                                        ctrl = win.get_control(jid_with_resource, account)
+                                        if ctrl:
                                                 ctrl.update_ui()
                                                 win.redraw_tab(ctrl)
@@ -1837 +1838 @@
                         uf_show = helpers.get_uf_show(show)
 
-                        for ctrl in win.get_controls(contact.jid, account):
+                        ctrl = win.get_control(contact.jid, account)
+                        if ctrl:
                                 ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
                                         account, contact.jid)