diff options
author | Jefry Lagrange <jefry.reyes@gmail.com> | 2012-06-09 04:02:45 +0400 |
---|---|---|
committer | Jefry Lagrange <jefry.reyes@gmail.com> | 2012-06-09 04:02:45 +0400 |
commit | 2b8890bf51fd69ae7e4e837c7024db2819edadff (patch) | |
tree | d64a7172fe08eb189c1691fb3190533b4619ace8 | |
parent | b050e63b602d5862349d1326b8f45d3203079a56 (diff) |
dont cancel when we cant bind to port. Fixes #7173
-rw-r--r-- | src/common/socks5.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/common/socks5.py b/src/common/socks5.py index 89402e898..534fcedbc 100644 --- a/src/common/socks5.py +++ b/src/common/socks5.py @@ -22,7 +22,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - import socket import struct import hashlib @@ -98,13 +97,6 @@ class SocksQueue: fingerprint=fingerprint) self.listener.queue = self self.listener.bind() - if self.listener.started is False: - self.listener = None - # We cannot bind port, call error callback and fail - self.error_cb(_('Unable to bind to port %s.') % port, - _('Maybe you have another running instance of Gajim. File ' - 'Transfer will be cancelled.')) - return None else: # There is already a listener, we update the file's information # on the new connection. @@ -1473,7 +1465,7 @@ class Socks5Listener(IdleObject): self.ai = None continue if not self.ai: - # unable to bind, show error dialog + log.error('unable to bind to port ' + str(self.port)) return None self._serv.listen(socket.SOMAXCONN) self._serv.setblocking(False) |