changeset 1ab5f2805c92 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1ab5f2805c92 description: check use_ft_proxies before discovering our server's proxy

diffstat:

src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r da85ddd405c2 -r 1ab5f2805c92 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Oct 21 19:49:58 2010 +0200 +++ b/src/common/connection_handlers.py Fri Oct 22 22:22:47 2010 +0200 @@ -381,7 +381,8 @@ self.archive_manual_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): 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( self.name) + '/' + self.server_resource) gajim.proxy65_manager.resolve(jid, self.connection, our_jid,