changeset ac7c628635eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac7c628635eb description: dont cancel when we cant bind to port. Fixes #7173
diffstat: src/common/socks5.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (34 lines): diff -r e2ec1b037b4d -r ac7c628635eb src/common/socks5.py --- a/src/common/socks5.py Wed May 30 08:30:49 2012 +0200 +++ b/src/common/socks5.py Fri Jun 08 20:02:45 2012 -0400 @@ -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 @@ 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 @@ 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) _______________________________________________ Commits mailing list [email protected] http://lists.gajim.org/cgi-bin/listinfo/commits
