Changeset 9955

Timestamp:

07/19/08 00:42:28 (5 months ago)

Author:

bct

Message:

disconnect session from chat window only when the highest remote contact changes

Files:

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

trunk/src/gajim.py

@@ -629 +629 @@
                         ji = jid
 
+                highest = gajim.contacts.get_contact_with_highest_priority(account, jid)
+                was_highest = (highest and highest.resource == resource)
+
                 # Update contact
                 jid_list = gajim.contacts.get_jid_list(account)
@@ -640 +643 @@
                                         contact1 = c
                                         break
-
-                        highest = gajim.contacts.get_highest_prio_contact_from_contacts(lcontact)
-                        if not highest or \
-                        (highest.priority < priority and highest.resource != resource) or \
-                        (highest.resource == resource and highest.priority > priority):
-                                # either this contact is the new highest priority contact or it was the
-                                # highest and dropped in priority (so may no longer be the highest)
-
-                                # disconnect sessions from this contact's chat controls so we
-                                # don't have to open a new tab if a new session comes in
-
-                                ctrl = self.msg_win_mgr.get_control(jid, account)
-                                if ctrl:
-                                        ctrl.set_session(None)
 
                         if contact1:
@@ -690 +679 @@
                                         lcontact.append(contact1)
                                 contact1.resource = resource
-                        
+
                                 self.roster.add_contact(contact1.jid, account)
 
@@ -781 +770 @@
                         self.handle_event_gc_notify(account, (jid, array[1], status_message,
                                 array[3], None, None, None, None, None, [], None, None))
+
+                highest = gajim.contacts.get_contact_with_highest_priority(account, jid)
+                is_highest = (highest and highest.resource == resource)
+
+                if was_highest and not is_highest:
+                        ctrl = self.msg_win_mgr.get_control(jid, account)
+                        if ctrl:
+                                ctrl.set_session(None)
 
         def handle_event_msgerror(self, account, array):