From 8da3246f08924b2cd9c6e039d1010b707c611fd1 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 22 Oct 2010 22:22:47 +0200 Subject: [PATCH] check use_ft_proxies before discovering our server's proxy --- src/common/connection_handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index 0d54ec5e2..97b45d8e3 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -381,7 +381,8 @@ class ConnectionDisco: 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,