Changeset 9879

Timestamp:

07/03/08 23:43:28 (3 months ago)

Author:

asterix

Message:

keep caps info when we create a contact instance from groupchat_contact instance

Files:

• trunk/src/common/contacts.py (modified) (3 diffs)

trunk/src/common/contacts.py

@@ -27 +27 @@
         '''Information concerning each contact'''
         def __init__(self, jid='', name='', groups=[], show='', status='', sub='',
-        ask='', resource='', priority=0, keyID='', our_chatstate=None,
-        chatstate=None, last_status_time=None, msg_id = None, composing_xep = None,
-        mood={}, tune={}, activity={}):
+        ask='', resource='', priority=0, keyID='', caps_node=None,
+        caps_hash_method=None, caps_hash=None, our_chatstate=None, chatstate=None,
+        last_status_time=None, msg_id = None, composing_xep = None,     mood={}, tune={},
+        activity={}):
                 self.jid = jid
                 self.name = name
@@ -44 +45 @@
                 # Capabilities; filled by caps.py/ConnectionCaps object
                 # every time it gets these from presence stanzas
-                self.caps_node = None
-                self.caps_hash_method = None
-                self.caps_hash = None
+                self.caps_node = caps_node
+                self.caps_hash_method = caps_hash_method
+                self.caps_hash = caps_hash
 
                 # please read xep-85 http://www.xmpp.org/extensions/xep-0085.html
@@ -534 +535 @@
                 '''Create a Contact instance from a GC_Contact instance'''
                 jid = gc_contact.get_full_jid()
-                return Contact(jid = jid, resource = '', name = gc_contact.name,
-                        groups = [], show = gc_contact.show, status = gc_contact.status,
-                        sub = 'none')
+                return Contact(jid=jid, resource='', name=gc_contact.name, groups=[],
+                        show=gc_contact.show, status=gc_contact.status, sub='none',
+                        caps_node=gc_contact.caps_node,
+                        caps_hash_method=gc_contact.caps_hash_method,
+                        caps_hash=gc_contact.caps_hash)
 
         def create_gc_contact(self, room_jid='', name='', show='', status='',