Author: js Date: 2008-07-15 15:51:20 +0200 (Tue, 15 Jul 2008) New Revision: 9936

Modified: trunk/src/common/connection.py Log: Proper checking for XEP-0085, with workaround for the caps missing problem. Same here, remove check to notexistant once we have fallback to disco.

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-07-15 13:31:25 UTC (rev 9935) +++ trunk/src/common/connection.py 2008-07-15 13:51:20 UTC (rev 9936) @@ -1121,16 +1121,25 @@ # please note that the only valid tag inside a message containing a <body> # tag is the active event if chatstate is not None: - if (composing_xep == 'XEP-0085' or not composing_xep) and \ - composing_xep != 'asked_once': + # XXX: Once we have fallback to disco, + # remove notexistant check + if ((composing_xep == 'XEP-0085' or not composing_xep) \ + and composing_xep != 'asked_once') or \ + (gajim.capscache.is_supported(contact, + xmpp.NS_CHATSTATES) and \ + not gajim.capscache.is_supported(contact, + 'notexistant')): # XEP-0085 - msg_iq.setTag(chatstate, namespace = common.xmpp.NS_CHATSTATES) - if composing_xep in ('XEP-0022', 'asked_once') or not composing_xep: + msg_iq.setTag(chatstate, + namespace = common.xmpp.NS_CHATSTATES) + if composing_xep in ('XEP-0022', 'asked_once') or \ + not composing_xep: # XEP-0022 chatstate_node = msg_iq.setTag('x', namespace = common.xmpp.NS_EVENT) if chatstate is 'composing' or msgtxt: - chatstate_node.addChild(name = 'composing') + chatstate_node.addChild( + name = 'composing')

if forward_from: addresses = msg_iq.addChild('addresses',