Changeset 9636

Timestamp:

05/14/08 02:37:06 (2 months ago)

Author:

bct

Message:

fix multipopup when receiving several unthreaded messages

Files:

• trunk/src/session.py (modified) (2 diffs)

trunk/src/session.py

@@ -56 +56 @@
-        def received(self, full_jid_with_resource, msgtxt, tim, encrypted, subject, msg):
-                msg_type = msg.getType()
+
+                if not msg_type:
+                        msg_type = 'normal'
+
-                msg_id = None
-
@@ -114 +118 @@
-
-                jid_of_control = full_jid_with_resource
+
+                highest_contact = gajim.contacts.get_contact_with_highest_priority(
+                        self.conn.name, jid)
+
+                if not pm:
+                        if not highest_contact or not highest_contact.resource or \
+                        resource == highest_contact.resource or highest_contact.show == 'offline':
+                                jid_of_control = jid
-
-                # Handle chat states