Changeset 9853

Timestamp:

06/27/08 17:07:15 (5 months ago)

Author:

asterix

Message:

entity capabilities for groupchat contacts. fixes #4033

Files:

• trunk/src/common/caps.py (modified) (2 diffs)

trunk/src/common/caps.py

@@ -207 +207 @@
                 gajim.capscache.preload(self, jid, node, hash_method, hash)
 
-                contact=gajim.contacts.get_contact_from_full_jid(self.name, jid)
-                if contact in [None, []]:
-                        return  # TODO: a way to put contact not-in-roster into Contacts
-                elif isinstance(contact, list):
-                        contact = contact[0]
+                contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
+                if contact is None:
+                        room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
+                        contact = gajim.contacts.get_gc_contact(self.name, room_jid, nick)
+                        if contact is None:
+                                return  # TODO: a way to put contact not-in-roster into Contacts
 
                 # overwriting old data
@@ -221 +222 @@
                 contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
                 if not contact:
-                        return
+                        room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
+                        contact = gajim.contacts.get_gc_contact(self.name, room_jid, nick)
+                        if contact is None:
+                                return
                 if not contact.caps_node:
                         return # we didn't asked for that?