changeset 8dfb09dc9387 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=8dfb09dc9387
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 15db3c1d792b -r 8dfb09dc9387 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
@@ -360,7 +360,8 @@
our_jid = gajim.get_jid_from_account(self.name)
self.send_pb_purge(our_jid, 'storage:bookmarks')
self.send_pb_delete(our_jid, 'storage:bookmarks')
- 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,
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
