From 3e88fdf41e04001147ad94773015bdad467645b5 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 30 Nov 2008 18:53:02 +0000 Subject: [PATCH] check session support instead of Esession support, and announce we support it. Fixes #4429 --- src/common/connection_handlers.py | 2 +- src/common/gajim.py | 2 +- src/common/xmpp/protocol.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index d8938240d..bf11c9b0d 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -2186,7 +2186,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, 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] diff --git a/src/common/gajim.py b/src/common/gajim.py index 932a9ec13..139bb3352 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -180,7 +180,7 @@ gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE, 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 diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py index 356d22a75..e80e26bc9 100644 --- a/src/common/xmpp/protocol.py +++ b/src/common/xmpp/protocol.py @@ -92,7 +92,8 @@ NS_SESSION ='urn:ietf:params:xml:ns:xmpp-session' 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'