Commits

commits@gajim.org

17632 discussions

gajim: Gajim requires python-nbxmpp-0.5.1
by Gajim 04 Oct '14

04 Oct '14

changeset 8c82233789f1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8c82233789f1 description: Gajim requires python-nbxmpp-0.5.1 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d0ffcb0c86f0 -r 8c82233789f1 src/gajim.py --- a/src/gajim.py Fri Oct 03 22:48:14 2014 +0200 +++ b/src/gajim.py Sat Oct 04 22:27:55 2014 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.5" +MIN_NBXMPP_VER = "0.5.1" try: import nbxmpp except ImportError:

1 0

python-nbxmpp: fix typo
by Python-nbxmpp 04 Oct '14

04 Oct '14

changeset 3576e2306099 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3576e2306099 description: fix typo diffstat: nbxmpp/transports_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r ccc3bddcc429 -r 3576e2306099 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Oct 04 22:10:32 2014 +0200 +++ b/nbxmpp/transports_nb.py Sat Oct 04 22:21:38 2014 +0200 @@ -370,7 +370,7 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno, + errnum, errstr = exc.errno,\ exc.strerror.decode(locale.getpreferredencoding()) if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): @@ -602,7 +602,7 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, + errnum, errstr = e.errno,\ e.strerror.decode(locale.getpreferredencoding()) if received == '':

1 0

python-nbxmpp: fix 0.5.1 tag
by Python-nbxmpp 04 Oct '14

04 Oct '14

changeset 0c337cf01ae4 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=0c337cf01ae4 description: fix 0.5.1 tag diffstat: .hgtags | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 3576e2306099 -r 0c337cf01ae4 .hgtags --- a/.hgtags Sat Oct 04 22:21:38 2014 +0200 +++ b/.hgtags Sat Oct 04 22:25:11 2014 +0200 @@ -3,4 +3,4 @@ 3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3 46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4 70c9ac0c2b9bd3786df85d921c7f0a54fa6c92b4 nbxmpp-0.5 -49e334038ca62e77558d0c705615e92ea15c1fdf nbxmpp-0.5.1 +3576e23060992c7157b070faae0cb69dbb981079 nbxmpp-0.5.1

1 0

python-nbxmpp: Added tag nbxmpp-0.5.1 for changeset 49e334038ca6
by Python-nbxmpp 04 Oct '14

04 Oct '14

changeset ccc3bddcc429 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=ccc3bddcc429 description: Added tag nbxmpp-0.5.1 for changeset 49e334038ca6 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 49e334038ca6 -r ccc3bddcc429 .hgtags --- a/.hgtags Sat Oct 04 22:10:22 2014 +0200 +++ b/.hgtags Sat Oct 04 22:10:32 2014 +0200 @@ -3,3 +3,4 @@ 3bf3d313e8693a273fe1a44723606ff5c6a3aba1 nbxmpp-0.3 46e9c8c80bacac8260245d5d9752ba0c5bddcf89 nbxmpp-0.4 70c9ac0c2b9bd3786df85d921c7f0a54fa6c92b4 nbxmpp-0.5 +49e334038ca62e77558d0c705615e92ea15c1fdf nbxmpp-0.5.1

1 0

python-nbxmpp: prepare 0.5.1 release
by Python-nbxmpp 04 Oct '14

04 Oct '14

changeset 49e334038ca6 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=49e334038ca6 description: prepare 0.5.1 release diffstat: ChangeLog | 4 ++++ nbxmpp/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diffs (32 lines): diff -r f48052492c24 -r 49e334038ca6 ChangeLog --- a/ChangeLog Sat Oct 04 21:55:56 2014 +0200 +++ b/ChangeLog Sat Oct 04 22:10:22 2014 +0200 @@ -1,3 +1,7 @@ +python-nbxmpp 0.5.1 (04 October 2014) + + * Fix printing network errors in a non-utf-8 console + python-nbxmpp 0.5 (02 July 2014) * support both python2 and python3 diff -r f48052492c24 -r 49e334038ca6 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Sat Oct 04 21:55:56 2014 +0200 +++ b/nbxmpp/__init__.py Sat Oct 04 22:10:22 2014 +0200 @@ -17,4 +17,4 @@ from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.5" +__version__ = "0.5.1" diff -r f48052492c24 -r 49e334038ca6 setup.py --- a/setup.py Sat Oct 04 21:55:56 2014 +0200 +++ b/setup.py Sat Oct 04 22:10:22 2014 +0200 @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5', + version='0.5.1', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org',

1 0

python-nbxmpp: don't crash when printing errors in logs on non-u...
by Python-nbxmpp 04 Oct '14

04 Oct '14

changeset f48052492c24 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=f48052492c24 description: don't crash when printing errors in logs on non-utf-8 console. diffstat: nbxmpp/transports_nb.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (41 lines): diff -r 51736d2c5fd2 -r f48052492c24 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Wed Jul 02 18:04:10 2014 +0200 +++ b/nbxmpp/transports_nb.py Sat Oct 04 21:55:56 2014 +0200 @@ -37,6 +37,7 @@ import time import traceback import base64 +import locale try: from urllib.parse import urlparse @@ -369,7 +370,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno, exc.strerror + errnum, errstr = exc.errno, + exc.strerror.decode(locale.getpreferredencoding()) if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -472,7 +474,8 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - log.info('Error while disconnecting socket: %s' % str(e)) + errstr = e.strerror.decode(locale.getpreferredencoding()) + log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -599,7 +602,8 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, e.strerror + errnum, errstr = e.errno, + e.strerror.decode(locale.getpreferredencoding()) if received == '': errstr = 'zero bytes on recv'

1 0

gajim: don't allow to delete contacts from an offline account. F...
by Gajim 03 Oct '14

03 Oct '14

changeset d0ffcb0c86f0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d0ffcb0c86f0 description: don't allow to delete contacts from an offline account. Fixes #7822 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (17 lines): diff -r f5e94ba22b4c -r d0ffcb0c86f0 src/roster_window.py --- a/src/roster_window.py Mon Sep 15 14:03:52 2014 +0200 +++ b/src/roster_window.py Fri Oct 03 22:48:14 2014 +0200 @@ -3441,9 +3441,13 @@ return jid = model[path][C_JID].decode('utf-8') account = model[path][C_ACCOUNT].decode('utf-8') + if not gajim.account_is_connected(account): + continue contact = gajim.contacts.get_contact_with_highest_priority( account, jid) list_.append((contact, account)) + if not list_: + return if type_ == 'contact': self.on_req_usub(widget, list_) elif type_ == 'agent':

1 0

gajim: remove useless test
by Gajim 15 Sep '14

15 Sep '14

changeset f5e94ba22b4c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)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

1 0

gajim: allow = char in option values. Fixes #7804
by Gajim 14 Sep '14

14 Sep '14

changeset f360573b36ed in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f360573b36ed description: allow = char in option values. Fixes #7804 diffstat: src/common/optparser.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3e5fd4d1e3f9 -r f360573b36ed src/common/optparser.py --- a/src/common/optparser.py Sun Sep 14 14:23:31 2014 +0200 +++ b/src/common/optparser.py Sun Sep 14 14:47:03 2014 +0200 @@ -56,7 +56,7 @@ new_version = gajim.config.get('version') new_version = new_version.split('-', 1)[0] seen = set() - regex = re.compile(r"(?P<optname>[^.]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.]+))?\s=\s(?P<value>.*)") + regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)") for line in fd: try:

1 0

gajim: display error messages even if they don't have a <body>. ...
by Gajim 14 Sep '14

14 Sep '14

changeset 3e5fd4d1e3f9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3e5fd4d1e3f9 description: display error messages even if they don't have a <body>. Fixes #7798, see #6756 diffstat: src/common/connection_handlers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 43cb67972361 -r 3e5fd4d1e3f9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Sep 07 21:51:06 2014 +0200 +++ b/src/common/connection_handlers.py Sun Sep 14 14:23:31 2014 +0200 @@ -1233,6 +1233,8 @@ 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)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits