Changeset 9846 for trunk/src/common/helpers.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/common/helpers.py (modified) (1 diff)

trunk/src/common/helpers.py

@@ -959 +959 @@
         highest_contact = gajim.contacts.get_contact_with_highest_priority(
                 account, contact.jid)
+
         # Look for a chat control that has the given resource, or default to
         # one without resource
-        ctrls = gajim.interface.msg_win_mgr.get_chat_controls(full_jid_with_resource,
+        ctrl = gajim.interface.msg_win_mgr.get_control(full_jid_with_resource,
                 account)
-        if ctrls:
-                return ctrls[0]
-        elif not highest_contact or not highest_contact.resource:
-                # unknow contact or offline message
-                pass # fall through, handle this at the end
-        elif highest_contact and contact.resource != \
-        highest_contact.resource:
+
+        if ctrl:
+                return ctrl
+        elif highest_contact and highest_contact.resource and \
+        contact.resource != highest_contact.resource:
                 return None
-
-        ctrls = gajim.interface.msg_win_mgr.get_chat_controls(contact.jid, account)
-        if ctrls:
-                return ctrls[0]
-        else:
-                return None
+        else:
+                # unknown contact or offline message
+                return gajim.interface.msg_win_mgr.get_control(contact.jid, account)
 
 def reduce_chars_newlines(text, max_chars = 0, max_lines = 0):