From eb93f9a17259f9047bb378ea1a5fae269809b4ae Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 20 Aug 2007 19:02:58 +0000 Subject: [PATCH] advertise xep-0116 support via disco --- src/common/connection_handlers.py | 6 ++++-- src/common/stanza_session.py | 2 +- src/common/xmpp/protocol.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 77e493ca2..0e07e01f4 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -733,6 +733,7 @@ class ConnectionDisco: q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC}) q.addChild('feature', attrs = {'var': common.xmpp.NS_COMMANDS}) q.addChild('feature', attrs = {'var': common.xmpp.NS_DISCO_INFO}) + q.addChild('feature', attrs = {'var': common.xmpp.NS_ESESSION_INIT}) if (node is None or extension == 'cstates') and gajim.config.get('outgoing_chat_state_notifactions') != 'disabled': q.addChild('feature', attrs = {'var': common.xmpp.NS_CHATSTATES}) @@ -1220,7 +1221,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, def _InitE2ECB(self, con, stanza, session): gajim.log.debug('InitE2ECB') - init = stanza.getTag(name='init', namespace='http://www.xmpp.org/extensions/xep-0116.html#ns-init') + init = stanza.getTag(name='init', namespace=common.xmpp.NS_ESESSION_INIT) form = common.xmpp.DataForm(node=init.getTag('x')) self.dispatch('SESSION_NEG', (stanza.getFrom(), session, form)) @@ -1448,7 +1449,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, common.xmpp.NS_FEATURE: self._FeatureNegCB(con, msg, session) return - if msg.getTag('init') and msg.getTag('init').namespace == 'http://www.xmpp.org/extensions/xep-0116.html#ns-init': + if msg.getTag('init') and msg.getTag('init').namespace == \ + common.xmpp.NS_ESESSION_INIT: self._InitE2ECB(con, msg, session) encrypted = False diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py index 6af56d203..e1ffc53f9 100644 --- a/src/common/stanza_session.py +++ b/src/common/stanza_session.py @@ -730,7 +730,7 @@ class EncryptedStanzaSession(StanzaSession): response = xmpp.Message() init = response.NT.init - init.setNamespace('http://www.xmpp.org/extensions/xep-0116.html#ns-init') + init.setNamespace(xmpp.NS_ESESSION_INIT) x = xmpp.DataForm(typ='result') diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py index 7d903a292..aa43126f8 100644 --- a/src/common/xmpp/protocol.py +++ b/src/common/xmpp/protocol.py @@ -45,6 +45,7 @@ NS_DISCO ='http://jabber.org/protocol/disco' NS_DISCO_INFO =NS_DISCO+'#info' NS_DISCO_ITEMS =NS_DISCO+'#items' NS_ENCRYPTED ='jabber:x:encrypted' # JEP-0027 +NS_ESESSION_INIT='http://www.xmpp.org/extensions/xep-0116.html#ns-init' NS_EVENT ='jabber:x:event' # JEP-0022 NS_FEATURE ='http://jabber.org/protocol/feature-neg' NS_FILE ='http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096