copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Handle it correctly if caps were removed.

Browse source 
YES, it CAN happen that we had caps and now got a presence without!
And that WILL happen very often, for example if the other end signs
off!
This commit is contained in:
js 2008-07-23 18:28:55 +00:00
parent 0d9a73cde9
commit 40112aa128
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/common/caps.py
View file

@ -202,32 +202,42 @@ class ConnectionCaps(object):
''' Handle incoming presence stanzas... This is a callback ''' Handle incoming presence stanzas... This is a callback
for xmpp registered in connection_handlers.py''' for xmpp registered in connection_handlers.py'''
# get the caps element
caps = presence.getTag('c')
if not caps:
return
hash_method, node, hash = caps['hash'], caps['node'], caps['ver']
if hash_method is None or node is None or hash is None:
# improper caps in stanza, ignoring
return
# we will put these into proper Contact object and ask # we will put these into proper Contact object and ask
# for disco... so that disco will learn how to interpret # for disco... so that disco will learn how to interpret
# these caps # these caps
jid = helpers.get_full_jid_from_iq(presence) jid = helpers.get_full_jid_from_iq(presence)
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:
# TODO: a way to put contact not-in-roster
# into Contacts
return
# get the caps element
caps = presence.getTag('c')
if not caps:
contact.caps_node = None
contact.caps_hash = None
contact.hash_method = None
return
hash_method, node, hash = \
caps['hash'], caps['node'], caps['ver']
if hash_method is None or node is None or hash is None:
# improper caps in stanza, ignoring
contact.caps_node = None
contact.caps_hash = None
contact.hash_method = None
return
# start disco query... # start disco query...
gajim.capscache.preload(self, jid, node, hash_method, hash) gajim.capscache.preload(self, jid, node, hash_method, hash)
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 # overwriting old data
contact.caps_node = node contact.caps_node = node
contact.caps_hash_method = hash_method contact.caps_hash_method = hash_method