Author: asterix Date: 2008-11-30 19:53:02 +0100 (Sun, 30 Nov 2008) New Revision: 10726

Modified: trunk/src/common/connection_handlers.py trunk/src/common/gajim.py trunk/src/common/xmpp/protocol.py Log: check session support instead of Esession support, and announce we support it. Fixes #4429

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/connection_handlers.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -2186,7 +2186,7 @@ contact = gajim.contacts.get_contact(self.name, jid_stripped)

session_supported = gajim.capscache.is_supported(contact, - common.xmpp.NS_ESESSION) + common.xmpp.NS_SSN) if session_supported: sess.terminate() del self.sessions[jid_stripped][sess.thread_id]

Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/gajim.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -180,7 +180,7 @@ xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6', 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', - 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING, + 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK]

# Optional features gajim supports per account

Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2008-11-30 18:16:11 UTC (rev 10725) +++ trunk/src/common/xmpp/protocol.py 2008-11-30 18:53:02 UTC (rev 10726) @@ -92,7 +92,8 @@ NS_SI ='http://jabber.org/protocol/si' # XEP-0096 NS_SI_PUB ='http://jabber.org/protocol/sipub' # XEP-0137 NS_SIGNED ='jabber:x:signed' # XEP-0027 -NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # JEP-0200 +NS_SSN ='urn:xmpp:ssn' # XEP-0155 +NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' NS_STREAM ='http://affinix.com/jabber/stream' NS_STREAMS ='http://etherx.jabber.org/streams'