copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't count echo as a file transfer proxy. Fixes #4411

This commit is contained in:
Yann Leboulanger 2008-11-02 15:02:49 +00:00
parent f5ae955764
commit 223dc0a8f2
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/connection_handlers.py
View File

@ -758,26 +758,30 @@ class ConnectionDisco:
if self.commandInfoQuery(con, iq_obj): if self.commandInfoQuery(con, iq_obj):
raise common.xmpp.NodeProcessed raise common.xmpp.NodeProcessed
else: id = unicode(iq_obj.getAttr('id'))
iq = iq_obj.buildReply('result') if id[0] == 'p':
q = iq.getTag('query') # We get this request from echo.server
if node: raise common.xmpp.NodeProcessed
q.setAttr('node', node)
q.addChild('identity', attrs = gajim.gajim_identity)
extension = None
if node and node.find('#') != -1:
extension = node[node.index('#') + 1:]
client_version = 'http://gajim.org#' + gajim.caps_hash[self.name]
if node in (None, client_version): iq = iq_obj.buildReply('result')
for f in gajim.gajim_common_features: q = iq.getTag('query')
q.addChild('feature', attrs = {'var': f}) if node:
for f in gajim.gajim_optional_features[self.name]: q.setAttr('node', node)
q.addChild('feature', attrs = {'var': f}) q.addChild('identity', attrs = gajim.gajim_identity)
extension = None
if node and node.find('#') != -1:
extension = node[node.index('#') + 1:]
client_version = 'http://gajim.org#' + gajim.caps_hash[self.name]
if q.getChildren(): if node in (None, client_version):
self.connection.send(iq) for f in gajim.gajim_common_features:
raise common.xmpp.NodeProcessed q.addChild('feature', attrs = {'var': f})
for f in gajim.gajim_optional_features[self.name]:
q.addChild('feature', attrs = {'var': f})
if q.getChildren():
self.connection.send(iq)
raise common.xmpp.NodeProcessed
def _DiscoverInfoErrorCB(self, con, iq_obj): def _DiscoverInfoErrorCB(self, con, iq_obj):
gajim.log.debug('DiscoverInfoErrorCB') gajim.log.debug('DiscoverInfoErrorCB')