Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_0.16] do not create Event when we auto popup a normal message. Fixes #8645
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 59b3b3ae by Yann Leboulanger at 2017-08-13T23:05:25+02:00 do not create Event when we auto popup a normal message. Fixes #8645 - - - - - 1 changed file: - src/session.py Changes: ===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -247,18 +247,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + do_event = False elif obj.forwarded and obj.sent: # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False gajim.events.remove_events(self.conn.name, fjid, types=['chat']) + do_event = False else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - + if obj.mtype == 'normal' and not obj.popup: + do_event = False + else: + do_event = True + if do_event: event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] do not create Event when we auto popup a normal message. Fixes #8645
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 9b866fd1 by Yann Leboulanger at 2017-08-13T23:03:11+02:00 do not create Event when we auto popup a normal message. Fixes #8645 - - - - - 1 changed file: - gajim/session.py Changes: ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -242,18 +242,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + do_event = False elif obj.forwarded and obj.sent: # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False gajim.events.remove_events(self.conn.name, fjid, types=['chat']) + do_event = False else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - + if obj.mtype == 'normal' and not obj.popup: + do_event = False + else: + do_event = True + if do_event: event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b866fd1a05ddd37d70aecda9c605d2040… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9b866fd1a05ddd37d70aecda9c605d2040… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix norwegian translation
by Yann Leboulanger 13 Aug '17

13 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0244ac44 by Yann Leboulanger at 2017-08-13T15:51:36+02:00 fix norwegian translation - - - - - 3 changed files: - po/LINGUAS - po/nb.po → po/nb_NO.po - − po/no.po Changes: ===================================== po/LINGUAS ===================================== --- a/po/LINGUAS +++ b/po/LINGUAS @@ -7,7 +7,7 @@ es ru bg de -nb +nb_NO cs nl pt_BR @@ -15,7 +15,6 @@ sv it eu sk -no zh_CN br eo ===================================== po/nb.po → po/nb_NO.po ===================================== ===================================== po/no.po deleted ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0244ac447514af869aa29deaa740fb75f4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0244ac447514af869aa29deaa740fb75f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] OptionsDialog: Center switch button vertically
by Philipp Hörist 12 Aug '17

12 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27afece6 by Philipp Hörist at 2017-08-13T00:50:39+02:00 OptionsDialog: Center switch button vertically - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3678,6 +3678,7 @@ class SwitchOption(Gtk.Grid): self.switch.connect("notify::active", callback, *user_data) self.switch.set_hexpand(True) self.switch.set_halign(Gtk.Align.END) + self.switch.set_valign(Gtk.Align.CENTER) self.add(label) self.add(self.switch) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27afece67808eb6460bc970f125ae3f885… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27afece67808eb6460bc970f125ae3f885… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add maximize button to XMLConsole window
by Philipp Hörist 12 Aug '17

12 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5554e994 by Philipp Hörist at 2017-08-13T00:45:03+02:00 Add maximize button to XMLConsole window - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -3365,8 +3365,6 @@ class XMLConsoleWindow(Gtk.Window): switch.connect("notify::active", self.on_enable) headerbar.pack_start(switch) - headerbar.set_decoration_layout(':minimize,close') - self.enabled = True self.presence = True self.message = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5554e994524a1840e8b166958fa4adfc89… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5554e994524a1840e8b166958fa4adfc89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] unify cid -> candidate_id
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 43b3d1bd by Yann Leboulanger at 2017-08-12T22:55:17+02:00 unify cid -> candidate_id - - - - - 3 changed files: - gajim/common/jingle_ftstates.py - gajim/common/jingle_transport.py - gajim/common/socks5.py Changes: ===================================== gajim/common/jingle_ftstates.py ===================================== --- a/gajim/common/jingle_ftstates.py +++ b/gajim/common/jingle_ftstates.py @@ -79,7 +79,7 @@ class StateCandSent(JingleFileTransferStates): transport.setNamespace(nbxmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.jft.transport.sid) candidateused = nbxmpp.Node('candidate-used') - candidateused.setAttr('cid', streamhost['cid']) + candidateused.setAttr('cid', streamhost['candidate_id']) transport.addChild(node=candidateused) content.addChild(node=transport) self.jft.session.send_transport_info(content) ===================================== gajim/common/jingle_transport.py ===================================== --- a/gajim/common/jingle_transport.py +++ b/gajim/common/jingle_transport.py @@ -156,7 +156,7 @@ class JingleTransportSocks5(JingleTransport): 'target': self.ourjid, 'host': candidate['host'], 'port': int(candidate['port']), - 'cid': candidate['cid'], + 'candidate_id': candidate['cid'], 'type': typ, 'priority': candidate['priority'] } ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -133,13 +133,23 @@ class SocksQueue: else: fp = fingerprint if receiving: - log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Trying to connect as receiver to cid ' + \ + streamhost['candidate_id']) + else: + log.debug('Trying to connect as receiver to jid ' + \ + streamhost['jid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: - log.debug('Trying to connect as sender to cid' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Trying to connect as sender to cid' + \ + streamhost['candidate_id']) + else: + log.debug('Trying to connect as sender to jid' + \ + streamhost['jid']) if file_props.sha_str: idx = file_props.sha_str else: @@ -166,7 +176,10 @@ class SocksQueue: Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ - log.debug('Connected to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Connected to cid ' + streamhost['candidate_id']) + else: + log.debug('Connected to jid ' + streamhost['jid']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -228,7 +241,10 @@ class SocksQueue: """ Called when we loose connection during transfer """ - log.debug('Connection refused to cid ' + streamhost['cid']) + if 'candidate_id' in streamhost: + log.debug('Connection refused to cid ' + streamhost['candidate_id']) + else: + log.debug('Connection refused to jid ' + streamhost['jid']) if file_props is None: return streamhost['state'] = -1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43b3d1bd83538d3fe222c42d40295176da… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/43b3d1bd83538d3fe222c42d40295176da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: use precis_i18n instead of stringprepare when available to sanitize JIDs
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1a2ac87f by Yann Leboulanger at 2017-08-11T08:11:52+02:00 use precis_i18n instead of stringprepare when available to sanitize JIDs - - - - - b6189a60 by Yann Leboulanger at 2017-08-11T08:12:00+02:00 use idna python module to check domainpart when available - - - - - d468a1d9 by Yann Leboulanger at 2017-08-11T08:12:00+02:00 update optional dependencies - - - - - baa54f50 by Yann Leboulanger at 2017-08-12T14:55:08+02:00 Merge branch 'use_precis' into 'master' Use precis instead of stringprep when available. Fixes #8566 See merge request !116 - - - - - 2 changed files: - README - gajim/common/helpers.py Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -37,6 +37,7 @@ <li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li> <li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> <li>gir1.2-networkmanager-1.0 for network lose detection</li> +<li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li> </ul> <p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p> ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -53,6 +53,18 @@ import nbxmpp from common.i18n import Q_ from common.i18n import ngettext +try: + import precis_i18n.codec + HAS_PRECIS_I18N = True +except ImportError: + HAS_PRECIS_I18N = False + +try: + import idna + HAS_IDNA = True +except ImportError: + HAS_IDNA = False + HAS_SOUND = True if sys.platform == 'win32': try: @@ -244,8 +256,11 @@ def parse_resource(resource): """ if resource: try: - from nbxmpp.stringprepare import resourceprep - return resourceprep.prepare(resource) + if HAS_PRECIS_I18N: + return resource.encode('Nickname').decode('utf-8') + else: + from nbxmpp.stringprepare import resourceprep + return resourceprep.prepare(resource) except UnicodeError: raise InvalidFormat('Invalid character in resource.') @@ -274,33 +289,44 @@ def prep(user, server, resource): if not ip_address: if server is not None: - if len(server) < 1 or len(server) > 1023: - raise InvalidFormat(_('Server must be between 1 and 1023 chars')) + if server.endswith('.'): # RFC7622, 3.2 + server = server[:-1] + if len(server) < 1 or len(server.encode('utf-8')) > 1023: + raise InvalidFormat(_('Server must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nameprep - server = nameprep.prepare(server) + if HAS_IDNA: + server = idna.encode(server).decode('utf-8') + else: + from nbxmpp.stringprepare import nameprep + server = nameprep.prepare(server) except UnicodeError: raise InvalidFormat(_('Invalid character in hostname.')) else: raise InvalidFormat(_('Server address required.')) if user is not None: - if len(user) < 1 or len(user) > 1023: - raise InvalidFormat(_('Username must be between 1 and 1023 chars')) + if len(user) < 1 or len(user.encode('utf-8')) > 1023: + raise InvalidFormat(_('Username must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nodeprep - user = nodeprep.prepare(user) + if HAS_PRECIS_I18N: + user = user.encode('UsernameCaseMapped').decode('utf-8') + else: + from nbxmpp.stringprepare import nodeprep + user = nodeprep.prepare(user) except UnicodeError: raise InvalidFormat(_('Invalid character in username.')) else: user = None if resource is not None: - if len(resource) < 1 or len(resource) > 1023: - raise InvalidFormat(_('Resource must be between 1 and 1023 chars')) + if len(resource) < 1 or len(resource.encode('utf-8')) > 1023: + raise InvalidFormat(_('Resource must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import resourceprep - resource = resourceprep.prepare(resource) + if HAS_PRECIS_I18N: + resource = resource.encode('OpaqueString').decode('utf-8') + else: + from nbxmpp.stringprepare import resourceprep + resource = resourceprep.prepare(resource) except UnicodeError: raise InvalidFormat(_('Invalid character in resource.')) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af547a1827a1fd8e8b408912426e68367… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/af547a1827a1fd8e8b408912426e68367… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] don't close the socket we're using to tranfer file. Fixes #8657
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: af547a18 by Yann Leboulanger at 2017-08-12T14:40:26+02:00 don't close the socket we're using to tranfer file. Fixes #8657 - - - - - 1 changed file: - gajim/common/socks5.py Changes: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -585,7 +585,7 @@ class Socks5(object): pass self.file = None # Close file we're receiving into - if self.file_props.fd: + if self.file_props.fd and self.state >= 7: try: self.file_props.fd.close() except Exception: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/af547a1827a1fd8e8b408912426e68367c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/af547a1827a1fd8e8b408912426e68367c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: add .gitlab-ci.yml file
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 221b0b18 by Yann Leboulanger at 2017-08-12T14:19:16+02:00 add .gitlab-ci.yml file - - - - - 9e772a53 by Yann Leboulanger at 2017-08-12T14:24:43+02:00 Merge branch 'master' into 'master' add .gitlab-ci.yml file See merge request !8 - - - - - 1 changed file: - + .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +before_script: + - sudo apt-get update -qq && sudo apt-get build-dep -y -qq python-nbxmpp-nightly + +stages: + - test + - build + +run-test: + stage: test + script: + - ./test/runtests.py + +run-build: + stage: build + script: + - rm -rf dist + - export FN="nbxmpp-"$(date +%F) + - python setup.py sdist + - scp dist/nbxmpp-*.tar.gz panoramix:/var/www/gajim/downloads/snap/ci/$FN-$CI_COMMIT_SHA.tar.gz + + artifacts: + name: "nbxmpp-$CI_COMMIT_SHA" + expire_in: 1 week + paths: + - dist/nbxmpp-*.tar.gz View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f4c0ef02eea1091d483aa4862… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f4c0ef02eea1091d483aa4862… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] improve comparing XML
by Yann Leboulanger 12 Aug '17

12 Aug '17

Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: f4c0ef02 by Yann Leboulanger at 2017-08-12T14:17:51+02:00 improve comparing XML - - - - - 2 changed files: - test/lib/__init__.py - test/unit/test_xmpp_dispatcher_nb.py Changes: ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -9,12 +9,34 @@ root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') sys.path.insert(1, root) sys.path.insert(1, root + '/test/lib') -def sortxml(data): - sorted(data.attrs.keys()) +def xml2str_sorted(data): + s = "<" + data.name + if data.namespace: + if not data.parent or data.parent.namespace!=data.namespace: + if 'xmlns' not in data.attrs: + s += ' xmlns="%s"' % data.namespace + for key in sorted(data.attrs.keys()): + val = str(data.attrs[key]) + s += ' %s="%s"' % (key, val) + + s += ">" + cnt = 0 if data.kids: for a in data.kids: - if not isinstance(a, str): - sortxml(a) + if (len(data.data)-1) >= cnt: + s += data.data[cnt] + if isinstance(a, str): + s += a.__str__() + else: + s += xml2str_sorted(a) + cnt += 1 + if (len(data.data)-1) >= cnt: + s += data.data[cnt] + if not data.kids and s.endswith('>'): + s = s[:-1] + ' />' + else: + s += "</" + data.name + ">" + return s def setup_env(): pass ===================================== test/unit/test_xmpp_dispatcher_nb.py ===================================== --- a/test/unit/test_xmpp_dispatcher_nb.py +++ b/test/unit/test_xmpp_dispatcher_nb.py @@ -88,8 +88,7 @@ class TestDispatcherNB(unittest.TestCase): self._simulate_connect() stanza = "<iq type='get' />" def send(data): - lib.sortxml(data) - self.assertEqual(str(data), '<iq xmlns="jabber:client" type="error"><error code="501" type="cancel"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text></error></iq>') + self.assertEqual(lib.xml2str_sorted(data), '<iq xmlns="jabber:client" type="error"><error code="501" type="cancel"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text></error></iq>') self.client.send = send self.dispatcher.ProcessNonBlocking(stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f4c0ef02eea1091d483aa48622… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f4c0ef02eea1091d483aa48622… You're receiving this email because of your account on dev.gajim.org.

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