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

Don't traceback when receiving entity capabilties. Fixes #5492 

This is a workaround until the whole update_contact method is gone. It should not be needed.
This commit is contained in:
Stephan Erb 2009-12-13 00:55:04 +01:00
parent df7e278ed1
commit a48087aae7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/protocol/caps.py
View File

@ -101,10 +101,8 @@ class ConnectionCaps(object):
node = caps_hash = hash_method = None node = caps_hash = hash_method = None
contact.client_caps = self._create_suitable_client_caps(node, contact.client_caps = self._create_suitable_client_caps(node,
caps_hash, hash_method) caps_hash, hash_method)
log.warn("Computed and retrieved caps hash differ." +
"Ignoring caps of contact %s" % contact.get_full_jid())
self._dispatch_event('CAPS_RECEIVED', (jid,)) self._dispatch_event('CAPS_RECEIVED', (jid,))
# vim: se ts=3: # vim: se ts=3:

3
src/gui_interface.py
View File

@ -2007,8 +2007,7 @@ class Interface:
# ('CAPS_RECEIVED', account, (full_jid)) # ('CAPS_RECEIVED', account, (full_jid))
full_jid = data[0] full_jid = data[0]
pm_ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, account) pm_ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, account)
if pm_ctrl: if pm_ctrl and hasattr(pm_ctrl, "update_contact"):
print "pm updated"
pm_ctrl.update_contact() pm_ctrl.update_contact()
def register_handler(self, event, handler): def register_handler(self, event, handler):