changeset f5e94ba22b4c in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f5e94ba22b4c description: remove useless test

diffstat:

src/common/connection_handlers.py | 2 -- src/common/protocol/bytestream.py | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r f360573b36ed -r f5e94ba22b4c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Sep 14 14:47:03 2014 +0200 +++ b/src/common/connection_handlers.py Mon Sep 15 14:03:52 2014 +0200 @@ -1234,8 +1234,6 @@ if obj.mtype == 'error': if not obj.msgtxt: obj.msgtxt = _('message') - if not obj.msgtxt: - return True self.dispatch_error_message(obj.stanza, obj.msgtxt, obj.session, obj.fjid, obj.timestamp) return True diff -r f360573b36ed -r f5e94ba22b4c src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Sep 14 14:47:03 2014 +0200 +++ b/src/common/protocol/bytestream.py Mon Sep 15 14:03:52 2014 +0200 @@ -393,7 +393,7 @@ my_ips = [self.peerhost[0]] # The ip we're connected to server with # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): - if not addr[4][0] in my_ips and not addr[4][0].startswith('127'): + if not addr[4][0] in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1': my_ips.append(addr[4][0])

sender = file_props.sender