From a48087aae77780dd4a529f3785de66a42918a5be Mon Sep 17 00:00:00 2001 From: Stephan Erb Date: Sun, 13 Dec 2009 00:55:04 +0100 Subject: [PATCH] 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. --- src/common/protocol/caps.py | 4 +--- src/gui_interface.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/protocol/caps.py b/src/common/protocol/caps.py index 2844d05ae..268f1ffe2 100644 --- a/src/common/protocol/caps.py +++ b/src/common/protocol/caps.py @@ -101,10 +101,8 @@ class ConnectionCaps(object): node = caps_hash = hash_method = None contact.client_caps = self._create_suitable_client_caps(node, 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,)) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff --git a/src/gui_interface.py b/src/gui_interface.py index 52689e8e1..b21e696ac 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2007,8 +2007,7 @@ class Interface: # ('CAPS_RECEIVED', account, (full_jid)) full_jid = data[0] pm_ctrl = gajim.interface.msg_win_mgr.get_control(full_jid, account) - if pm_ctrl: - print "pm updated" + if pm_ctrl and hasattr(pm_ctrl, "update_contact"): pm_ctrl.update_contact() def register_handler(self, event, handler):