diff options
| author | Florent Le Coz <louiz@louiz.org> | 2011-11-12 16:51:24 +0100 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2011-11-12 16:51:24 +0100 |
| commit | e67e22766f0da948ee9f310d29278371ef9b0563 (patch) | |
| tree | 736b13f2f7f217ef94bec95404d7fa8a87c16d87 /src/connection.py | |
| parent | 75ae1772e49a59b373c26d1c942f25edd473921c (diff) | |
| parent | 05ef3594894e0bcbe80b98e81c2a2659ea01855f (diff) | |
| download | poezio-e67e22766f0da948ee9f310d29278371ef9b0563.tar.gz poezio-e67e22766f0da948ee9f310d29278371ef9b0563.tar.bz2 poezio-e67e22766f0da948ee9f310d29278371ef9b0563.tar.xz poezio-e67e22766f0da948ee9f310d29278371ef9b0563.zip | |
Merge branch 'master' of http://git.louiz.org/poezio
Diffstat (limited to 'src/connection.py')
| -rw-r--r-- | src/connection.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/connection.py b/src/connection.py index f407dfe9..0be94097 100644 --- a/src/connection.py +++ b/src/connection.py @@ -51,7 +51,7 @@ class Connection(sleekxmpp.ClientXMPP): self.register_plugin('xep_0085') if config.get('send_poezio_info', 'true') == 'true': info = {'name':'poezio', - 'version':'0.7.2-dev'} + 'version':'0.7.5-dev'} if config.get('send_os_info', 'true') == 'true': info['os'] = common.get_os_info() self.register_plugin('xep_0092', pconfig=info) @@ -63,9 +63,11 @@ class Connection(sleekxmpp.ClientXMPP): # With anon auth. # (domain, config.get('port', 5222)) custom_host = config.get('custom_host', '') - custom_port = config.get('custom_port', -1) - if custom_host and custom_port != -1: + custom_port = config.get('custom_port', 5222) + if custom_host: res = self.connect((custom_host, custom_port), reattempt=False) + elif custom_port != 5222: + res = self.connect((self.boundjid.host, custom_port), reattempt=False) else: res = self.connect(reattempt=False) if not res: |