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

check use_ft_proxies before discovering our server's proxy

This commit is contained in:
Yann Leboulanger 2010-10-22 22:22:47 +02:00
parent 36086dabb4
commit 8da3246f08
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/connection_handlers.py
View File

@ -381,7 +381,8 @@ class ConnectionDisco:
self.archive_manual_supported = True self.archive_manual_supported = True
if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): if features.__contains__(common.xmpp.NS_ARCHIVE_PREF):
self.archive_pref_supported = True self.archive_pref_supported = True
if features.__contains__(common.xmpp.NS_BYTESTREAM): if features.__contains__(common.xmpp.NS_BYTESTREAM) and \
gajim.config.get_per('accounts', self.name, 'use_ft_proxies'):
our_jid = helpers.parse_jid(gajim.get_jid_from_account( our_jid = helpers.parse_jid(gajim.get_jid_from_account(
self.name) + '/' + self.server_resource) self.name) + '/' + self.server_resource)
gajim.proxy65_manager.resolve(jid, self.connection, our_jid, gajim.proxy65_manager.resolve(jid, self.connection, our_jid,