Commits March 2020

commits@gajim.org

1 participants
104 discussions

[Git][gajim/gajim][master] Remove resolver code
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b62bda87 by lovetox at 2020-03-15T22:49:20+01:00 Remove resolver code nbxmpp does all the resolving - - - - - 4 changed files: - − gajim/common/resolver.py - gajim/gui_interface.py - − test/integration/__init__.py - − test/integration/test_resolver.py Changes: ===================================== gajim/common/resolver.py deleted ===================================== @@ -1,156 +0,0 @@ -# Copyright (C) 2006 Dimitur Kirov <dkirov(a)gmail.com> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import logging -import functools - -from gi.repository import Gio, GLib - -log = logging.getLogger('gajim.c.resolver') - - -def get_resolver(): - return GioResolver() - - -class CommonResolver(): - def __init__(self): - # dict {"host+type" : list of records} - self.resolved_hosts = {} - # dict {"host+type" : list of callbacks} - self.handlers = {} - - def resolve(self, host, on_ready, type_='srv'): - host = host.lower() - log.debug('resolve %s type=%s', host, type_) - assert(type_ in ['srv', 'txt']) - if not host: - # empty host, return empty list of srv records - on_ready([]) - return - if host + type_ in self.resolved_hosts: - # host is already resolved, return cached values - log.debug('%s already resolved: %s', - host, self.resolved_hosts[host + type_]) - on_ready(host, self.resolved_hosts[host + type_]) - return - if host + type_ in self.handlers: - # host is about to be resolved by another connection, - # attach our callback - log.debug('already resolving %s', host) - self.handlers[host + type_].append(on_ready) - else: - # host has never been resolved, start now - log.debug('Starting to resolve %s using %s', host, self) - self.handlers[host + type_] = [on_ready] - self.start_resolve(host, type_) - - def _on_ready(self, host, type_, result_list): - # practically it is impossible to be the opposite, but who knows :) - host = host.lower() - log.debug('Resolving result for %s: %s', host, result_list) - if host + type_ not in self.resolved_hosts: - self.resolved_hosts[host + type_] = result_list - if host + type_ in self.handlers: - for callback in self.handlers[host + type_]: - callback(host, result_list) - del self.handlers[host + type_] - - def start_resolve(self, host, type_): - pass - - -class GioResolver(CommonResolver): - """ - Asynchronous resolver using GIO. process() method has to be - called in order to proceed the pending requests. - """ - - def __init__(self): - super().__init__() - self.gio_resolver = Gio.Resolver.get_default() - - def start_resolve(self, host, type_): - if type_ == 'txt': - callback = functools.partial(self._on_ready_txt, host) - type_ = Gio.ResolverRecordType.TXT - else: - callback = functools.partial(self._on_ready_srv, host) - type_ = Gio.ResolverRecordType.SRV - - self.gio_resolver.lookup_records_async(host, type_, None, callback) - - def _on_ready_srv(self, host, source_object, result): - try: - variant_results = source_object.lookup_records_finish(result) - except GLib.Error as e: - if e.domain == 'g-resolver-error-quark': - result_list = [] - log.info("Could not resolve host: %s", e.message) - else: - raise - else: - result_list = [ - { - 'weight': weight, - 'prio': prio, - 'port': port, - 'host': host, - } - for prio, weight, port, host - in variant_results - ] - super()._on_ready(host, 'srv', result_list) - - def _on_ready_txt(self, host, source_object, result): - try: - variant_results = source_object.lookup_records_finish(result) - except GLib.Error as e: - if e.domain == 'g-resolver-error-quark': - result_list = [] - log.warning("Could not resolve host: %s", e.message) - else: - raise - else: - result_list = [res[0][0] for res in variant_results] - super()._on_ready(host, 'txt', result_list) - - -# below lines is on how to use API and assist in testing -if __name__ == '__main__': - from gi.repository import Gtk - resolver = get_resolver() - - def clicked(widget): - global resolver - host = text_view.get_text() - def on_result(host, result_array): - print('Result:\n' + repr(result_array)) - resolver.resolve(host, on_result) - win = Gtk.Window() - win.set_border_width(6) - win.connect('remove', Gtk.main_quit) - text_view = Gtk.Entry() - text_view.set_text('_xmpp-client._tcp.jabber.org') - hbox = Gtk.HBox() - hbox.set_spacing(3) - but = Gtk.Button(' Lookup SRV ') - hbox.pack_start(text_view, 5, True, 0) - hbox.pack_start(but, 0, True, 0) - but.connect('clicked', clicked) - win.add(hbox) - win.show_all() - Gtk.main() ===================================== gajim/gui_interface.py ===================================== @@ -2097,7 +2097,6 @@ class Interface: app.idlequeue = idlequeue.get_idlequeue() # resolve and keep current record of resolved hosts - app.resolver = resolver.get_resolver() app.socks5queue = socks5.SocksQueue(app.idlequeue, self.handle_event_file_rcv_completed, self.handle_event_file_progress, ===================================== test/integration/__init__.py deleted ===================================== @@ -1,6 +0,0 @@ -''' - -This package contains integration tests. Integration tests are tests -which require or include UI, network or both. - -''' ===================================== test/integration/test_resolver.py deleted ===================================== @@ -1,69 +0,0 @@ -import unittest - -from test import lib -lib.setup_env() - -from gi.repository import GLib - -from gajim.common import resolver - -NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' -JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' -JABBERCZ_SRV_NAME = '_xmpp-client._tcp.jabber.cz' - -TEST_LIST = [(NONSENSE_NAME, 'srv', False), - (JABBERCZ_SRV_NAME, 'srv', True)] - - -class TestResolver(unittest.TestCase): - ''' - Test for LibAsyncNSResolver and NSLookupResolver. Requires working - network connection. - ''' - def setUp(self): - self.main_context = GLib.MainContext() - self.main_context.push_thread_default() - self.main_loop = GLib.MainLoop(self.main_context) - self._reset() - self.resolver = None - - def tearDown(self): - self.main_context.pop_thread_default() - - def _reset(self): - self.expect_results = False - self.resolver = None - - def testGioResolver(self): - self._reset() - self.resolver = resolver.GioResolver() - - for name, type_, expect_results in TEST_LIST: - self.expect_results = expect_results - self._runGR(name, type_) - - def _runGR(self, name, type_): - self.resolver.resolve( - host=name, - type_=type_, - on_ready=self._myonready) - - self.main_loop.run() - - def _myonready(self, name, result_set): - if __name__ == '__main__': - from pprint import pprint - pprint('on_ready called ...') - pprint('hostname: %s' % name) - pprint('result set: %s' % result_set) - pprint('res.resolved_hosts: %s' % self.resolver.resolved_hosts) - pprint('') - if self.expect_results: - self.assertTrue(len(result_set) > 0) - else: - self.assertTrue(result_set == []) - self.main_loop.quit() - - -if __name__ == '__main__': - unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b62bda87b0e26386503309baebe3d6ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b62bda87b0e26386503309baebe3d6ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Register: Rename variables
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: cc377e71 by lovetox at 2020-03-15T22:25:17+01:00 Register: Rename variables - - - - - 1 changed file: - nbxmpp/modules/register.py Changes: ===================================== nbxmpp/modules/register.py ===================================== @@ -45,8 +45,8 @@ class Register: @call_on_response('_default_response') def unregister(self): - hostname = self._client.get_bound_jid().getDomain() - iq = Iq('set', to=hostname) + domain = self._client.get_bound_jid().getDomain() + iq = Iq('set', to=domain) query = iq.setQuery() query.setNamespace(NS_REGISTER) query.addChild('remove') @@ -55,7 +55,7 @@ class Register: @call_on_response('_on_register_form') def request_register_form(self, jid=None): if jid is None: - jid = self._client.Server + jid = self._client.domain return Iq('get', NS_REGISTER, to=jid) @callback @@ -124,9 +124,9 @@ class Register: @call_on_response('_on_password_change') def change_password(self, password): - hostname = self._client.get_bound_jid().getDomain() + domain = self._client.get_bound_jid().getDomain() username = self._client.get_bound_jid().getNode() - iq = Iq('set', NS_REGISTER, to=hostname) + iq = Iq('set', NS_REGISTER, to=domain) query = iq.getQuery() query.setTagData('username', username) query.setTagData('password', password) @@ -148,7 +148,7 @@ class Register: @call_on_response('_default_response') def change_password_with_form(self, form): - hostname = self._client.get_bound_jid().getDomain() - iq = Iq('set', NS_REGISTER, to=hostname) + domain = self._client.get_bound_jid().getDomain() + iq = Iq('set', NS_REGISTER, to=domain) iq.setQueryPayload(form) return iq View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cc377e71ed9aa4b1f541de27… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/cc377e71ed9aa4b1f541de27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André 15 Mar '20

15 Mar '20

André pushed to branch master at gajim / gajim Commits: e395205d by André Apitzsch at 2020-03-15T20:20:12+01:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '3.34' +runtime-version: '3.36' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -39,13 +39,9 @@ add-extensions: autodelete: true cleanup: - - '/bin/easy*' - /include - /lib/debug - /lib/pkgconfig - - /lib/python2.7 - - /share/aclocal - - /share/doc - /share/gtk-doc - /share/man - '*.a' @@ -55,11 +51,11 @@ modules: - name: python3-pycparser buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - pip3 install --prefix=/app pycparser-2.20-py2.py3-none-any.whl sources: - - type: archive - url: https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7… - sha256: a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3 + - type: file + url: https://files.pythonhosted.org/packages/ae/e7/d9c3a176ca4b02024debf82342dab… + sha256: 7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 - name: python3-cffi buildsystem: simple @@ -67,26 +63,26 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/2d/bf/960e5a422db3ac1a5e612cb35ca43… - sha256: 599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346 + url: https://files.pythonhosted.org/packages/05/54/3324b0c46340c31b909fcec598696… + sha256: 2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6 - name: python3-asn1crypto buildsystem: simple build-commands: - - pip3 install --prefix=/app asn1crypto-1.2.0-py2.py3-none-any.whl + - pip3 install --prefix=/app asn1crypto-1.3.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/6b/8c/ff300484eca90b397d919408619fa… - sha256: 7bb1cc02a5620b3d72da4ba070bda2f44f0e61b44dee910a302eddff802b6fb5 + url: https://files.pythonhosted.org/packages/e9/51/1db4a60049fb7390959be586b6eb7… + sha256: 831d2710d3274c8a74befdddaf9f17fcbf6e350534565074818722d6d615b315 - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-2.8-py2.py3-none-any.whl + - pip3 install --prefix=/app idna-2.9-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/14/2c/cd551d81dbe15200be1cf41cd0386… - sha256: ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c + url: https://files.pythonhosted.org/packages/89/e3/afebe61c546d18fb1709a61bee788… + sha256: a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa - name: python3-cryptography buildsystem: simple @@ -100,11 +96,11 @@ modules: - name: python3-pyopenssl buildsystem: simple build-commands: - - pip3 install --prefix=/app pyOpenSSL-19.0.0-py2.py3-none-any.whl + - pip3 install --prefix=/app pyOpenSSL-19.1.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/01/c8/ceb170d81bd3941cbeb9940fc6cc2… - sha256: c727930ad54b10fc157015014b666f2d8b41f70c0d03e83ab67624fd3dd5d1e6 + url: https://files.pythonhosted.org/packages/9e/de/f8342b68fa9e981d348039954657b… + sha256: 621880965a720b8ece2f1b2f54ea2071966ab00e2970ad2ce11d596102063504 - name: python3-dbus-python build-options: @@ -112,46 +108,55 @@ modules: PYTHON_VERSION: '3' sources: - type: archive - url: https://files.pythonhosted.org/packages/3f/e7/4edb582d1ffd5ac3c84188deea32e… - sha256: abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f + url: https://files.pythonhosted.org/packages/62/7e/d4fb56a1695fa65da0c8d3071855f… + sha256: 11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4 - name: python3-jeepney buildsystem: simple build-commands: - - pip3 install --prefix=/app jeepney-0.4.1-py3-none-any.whl + - pip3 install --prefix=/app jeepney-0.4.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/0a/4c/ef880713a6c6d628869596703167e… - sha256: f6a3f93464a0cf052f4e87da3c8b3ed1e27696758fb9739c63d3a74d9a1b6774 + url: https://files.pythonhosted.org/packages/79/31/2e8d42727595faf224c6dbb748c32… + sha256: d6c6b49683446d2407d2fe3acb7a368a77ff063f9182fe427da15d622adc24cf - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install --prefix=/app SecretStorage-3.1.1-py3-none-any.whl + - pip3 install --prefix=/app SecretStorage-3.1.2-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/c3/50/8a02cad020e949e6d7105f5f4530d… + sha256: b5ec909dde94d4ae2fa26af7c089036997030f0cf0a5cb372b4cccabd81c143b + + - name: python3-zipp + buildsystem: simple + build-commands: + - pip3 install --prefix=/app zipp-3.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/82/59/cb226752e20d83598d7fdcabd7819… - sha256: 7a119fb52a88e398dbb22a4b3eb39b779bfbace7e4153b7bc6e5954d86282a8a + url: https://files.pythonhosted.org/packages/b2/34/bfcb43cc0ba81f527bc4f40ef41ba… + sha256: aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b - - name: python3-entrypoints + - name: python3-importlib_metadata buildsystem: simple build-commands: - - pip3 install --prefix=/app entrypoints-0.3-py2.py3-none-any.whl + - pip3 install --prefix=/app importlib_metadata-1.5.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/ac/c6/44694103f8c221443ee6b0041f69e… - sha256: 589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 + url: https://files.pythonhosted.org/packages/8b/03/a00d504808808912751e64ccf414b… + sha256: b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-19.2.0-py2.py3-none-any.whl + - pip3 install --prefix=/app keyring-21.2.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/b1/08/ad1ae7262c8146bee3be360cc766d… - sha256: f5bb20ea6c57c2360daf0c591931c9ea0d7660a8d9e32ca84d63273f131ea605 + url: https://files.pythonhosted.org/packages/04/21/42d92822959a37ccc390742c2706c… + sha256: 8179b1cdcdcbc221456b5b74e6b7cfa06f8dd9f239eb81892166d9223d82c5ba - name: python3-css-parser buildsystem: simple @@ -183,8 +188,8 @@ modules: - /bin sources: - type: archive - url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.2.tar.xz - sha256: bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6 + url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.3.tar.xz + sha256: 5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8 - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e395205d791e0edcb1eaacd2a7d5b254… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e395205d791e0edcb1eaacd2a7d5b254… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Fix method call
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 49ae50f6 by lovetox at 2020-03-15T16:59:18+01:00 Client: Fix method call - - - - - 1 changed file: - nbxmpp/client.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -662,7 +662,7 @@ class Client(Observable): elif self.is_stream_secure: if self._mode.is_register: - if features.has_register: + if features.has_register(): self.state = StreamState.ACTIVE self._dispatcher.set_dispatch_callback(None) self.notify('connected') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/49ae50f646ae9c8afe92bb78… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/49ae50f646ae9c8afe92bb78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: README: Prefer pip install
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c960b114 by André Apitzsch at 2020-03-15T14:06:54+01:00 README: Prefer pip install pip checks for runtime requirements as defined in setup.cfg automatically. - - - - - bfc8b4b8 by André Apitzsch at 2020-03-15T14:13:54+01:00 README: Promote Flatpak - - - - - 31ee3c3b by André Apitzsch at 2020-03-15T14:14:25+01:00 README: Small fixes - - - - - f16bf688 by André Apitzsch at 2020-03-15T14:15:42+01:00 Raise minimal nbxmpp version Runtime check already uses the new version. - - - - - 2 changed files: - README.md - setup.cfg Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=0.9.90.4) +- python3-nbxmpp (>=0.9.94) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring @@ -42,18 +42,18 @@ - [Fedora](https://apps.fedoraproject.org/packages/gajim) - [Ubuntu](https://packages.ubuntu.com/gajim) +#### Flatpak + +see [README](./flatpak/README.md) + #### Snapshots -- [Daily Linux](https://www.gajim.org/downloads/snap/?M=D) +- [Daily Linux](https://www.gajim.org/downloads/snap/) - [Daily Windows](https://gajim.org/downloads/snap/win) #### Linux -``./setup.py install --root=/`` - -or - -``pip install .`` (python-pip is required) + pip install . #### Mac @@ -65,11 +65,7 @@ For developing you don't have to install Gajim. After installing all dependencies execute -``./launch.py`` - -#### Flatpak - -see [README](./flatpak/README.md) + ./launch.py #### Windows @@ -79,7 +75,7 @@ see [README](./win/README.md) #### Debugging -Execute gajim with --verbose +Execute gajim with `--verbose` #### Links ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=0.9.92 + nbxmpp>=0.9.94 precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.14.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f606606943befafaede16ef028053f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f606606943befafaede16ef028053f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] NodeBuilder: Don't add empty strings to cdata list
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 96961854 by lovetox at 2020-03-15T09:51:01+01:00 NodeBuilder: Don't add empty strings to cdata list It seems to serv no purpose and messes up the pretty printing - - - - - 1 changed file: - nbxmpp/simplexml.py Changes: ===================================== nbxmpp/simplexml.py ===================================== @@ -625,8 +625,6 @@ class NodeBuilder: except ValueError as e: self._document_attrs = None raise ValueError(str(e)) - if not self.last_is_data and self._ptr.parent: - self._ptr.parent.data.append('') self.last_is_data = 0 def _check_stream_start(self, ns, tag): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/96961854ec58dff104eb6726… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/96961854ec58dff104eb6726… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make XMLConsole work again
by Philipp Hörist 15 Mar '20

15 Mar '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6066069 by lovetox at 2020-03-15T08:59:14+01:00 Make XMLConsole work again - - - - - 2 changed files: - gajim/common/client.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/client.py ===================================== @@ -269,11 +269,14 @@ class Client(ConnectionHandlers): self.get_module('MAM').reset_state() def _on_stanza_sent(self, _client, signal_name, stanza): - pass + app.nec.push_incoming_event(NetworkEvent('stanza-sent', + account=self._account, + stanza=stanza)) def _on_stanza_received(self, _client, signal_name, stanza): - pass - + app.nec.push_incoming_event(NetworkEvent('stanza-received', + account=self._account, + stanza=stanza)) def get_own_jid(self, warn=False): """ Return the last full JID we received on a bind event. ===================================== gajim/gtk/xml_console.py ===================================== @@ -332,22 +332,25 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper): tag.set_priority(0) tag.set_property('invisible', value) - def _nec_stanza_received(self, obj): + def _nec_stanza_received(self, event): if self.selected_account is not None: - if obj.conn.name != self.selected_account: + if event.account != self.selected_account: return - self._print_stanza(obj, 'incoming') + self._print_stanza(event, 'incoming') - def _nec_stanza_sent(self, obj): + def _nec_stanza_sent(self, event): if self.selected_account is not None: - if obj.conn.name != self.selected_account: + if event.account != self.selected_account: return - self._print_stanza(obj, 'outgoing') + self._print_stanza(event, 'outgoing') + + def _print_stanza(self, event, kind): + account_label = app.get_account_label(event.account) + + stanza = event.stanza + if not isinstance(stanza, str): + stanza = stanza.__str__(fancy=True) - def _print_stanza(self, obj, kind): - account = app.get_jid_from_account(obj.conn.name) - stanza = obj.stanza_str - # Kind must be 'incoming' or 'outgoing' if not stanza: return @@ -369,8 +372,8 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper): stanza = '\n{stanza}\n\n'.format( kind=kind.capitalize(), time=time.strftime('%c'), - account=account, - stanza=stanza.replace('><', '>\n<')) + account=account_label, + stanza=stanza) buffer_.insert_with_tags_by_name(end_iter, stanza, type_, kind) if at_the_end: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f606606943befafaede16ef028053f26… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f606606943befafaede16ef028053f26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Fix line ending in README
by André 14 Mar '20

14 Mar '20

André pushed to branch master at gajim / gajim Commits: e568cad5 by André Apitzsch at 2020-03-13T00:14:22+01:00 Flatpak: Fix line ending in README - - - - - 57cb8142 by André Apitzsch at 2020-03-14T19:38:55+01:00 Flatpak: Update nightly version information - - - - - 1 changed file: - flatpak/README.md Changes: ===================================== flatpak/README.md ===================================== @@ -1,118 +1,126 @@ -# Install Gajim via Flatpak - -## Install pre-built version - -Make sure to follow the [setup guide](https://flatpak.org/setup/) before installing. - -*Note: Remove `--user` if you want a system-wide installation.* - -### Stable - -```bash -flatpak install --user https://flathub.org/repo/appstream/org.gajim.Gajim.flatpakref -``` - -### Nightly/master - -```bash -flatpak install --user https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.flatpakref -``` - -[Migrate your profile data](#migrate-your-data) if you like. - -### Install plugins - -To list available plugins, run - -```bash -flatpak search gajim.plugin -``` - -To install the stable/nightly version of OMEMO, for example, run - -```bash -flatpak install --user flathub org.gajim.Gajim.Plugin.omemo -``` - -or - -```bash -flatpak install --user gajim-nightly org.gajim.Gajim.Plugin.omemo -``` - -respectively. - -Note that **you need to restart Gajim** for Plugins to be enabled. - -## Install from source - -**Prerequisites:** - -You need to have `flatpak` and `flatpak-builder` installed. For this example, we use `git` for downloading/updating Gajim's sources. - -### Download Gajim's sources - -In this example, we do a `git clone` of the repository, so you need to have `git` installed. -Alternatively, you can also download the sources from our Gitlab via web browser. - -```bash -git clone https://dev.gajim.org/gajim/gajim.git ~/Gajim -cd ~/Gajim -``` - -*Note: Source tarballs and snapshots do _not_ include 'org.gajim.Gajim.yaml', which is necessary for installation via Flatpak.* - -### Install Gajim and dependencies - -Replace install path `~/Gajim/gajim_flatpak` with an install path of your choice. - -*Note: Remove `--user` if you want a system-wide installation.* - -```bash -flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo -flatpak --user install gnome org.gnome.Platform//3.34 -flatpak --user install gnome org.gnome.Sdk//3.34 -flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/flatpak/org.gajim.Gajim.yaml -flatpak --user remote-add --no-gpg-verify gajim_flatpak_repo gajim_flatpak_repo -flatpak --user install gajim_flatpak_repo org.gajim.Gajim -flatpak run org.gajim.Gajim -``` - -That's it, you are now running Gajim via Flatpak! - -[Migrate your profile data](#migrate-your-data) if you like. - -## How to update - -### Update Gajim's sources - -In this example, we use `git` to update the repository. You can also download the sources from our Gitlab via webbrowser. - -```bash -cd ~/Gajim -git pull --rebase -``` - -### Remove previous Flatpak directory - -```bash -rm -r ~/Gajim/gajim_flatpak -``` - -### Install and update Gajim - -```bash -flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/flatpak/org.gajim.Gajim.yaml -flatpak --user update -flatpak run org.gajim.Gajim -``` - -Gajim is now updated. - -## Migrate your data - -When switching to Flatpak you might want to migrate your user data (accounts, history, ...) from your previous installation. Just copy your user data from/to the following directories: - -Copy `.local/share/gajim` -> `.var/app/org.gajim.Gajim/data/gajim` - -Copy `.config/gajim` -> `.var/app/org.gajim.Gajim/config/gajim` +# Install Gajim via Flatpak + +## Install pre-built version + +Make sure to follow the [setup guide](https://flatpak.org/setup/) before installing. + +*Note: Remove `--user` if you want a system-wide installation.* + +### Stable + +```bash +flatpak install --user https://flathub.org/repo/appstream/org.gajim.Gajim.flatpakref +``` + +### Nightly/master + +```bash +flatpak install --user https://ftp.gajim.org/flatpak/appstream/org.gajim.Gajim.Devel.flatpakref +``` + +[Migrate your profile data](#migrate-your-data) if you like. + +### Install plugins + +To list available stable/nightly plugins, run + +```bash +flatpak search gajim.plugin +``` + +or + +```bash +flatpak remote-ls gajim-nightly +``` + +respectively. + +To install the stable/nightly version of OMEMO, for example, run + +```bash +flatpak install --user flathub org.gajim.Gajim.Plugin.omemo +``` + +or + +```bash +flatpak install --user gajim-nightly org.gajim.Gajim.Devel.Plugin.omemo +``` + +respectively. + +Note that **you need to restart Gajim** for Plugins to be enabled. + +## Install from source + +**Prerequisites:** + +You need to have `flatpak` and `flatpak-builder` installed. For this example, we use `git` for downloading/updating Gajim's sources. + +### Download Gajim's sources + +In this example, we do a `git clone` of the repository, so you need to have `git` installed. +Alternatively, you can also download the sources from our Gitlab via web browser. + +```bash +git clone https://dev.gajim.org/gajim/gajim.git ~/Gajim +cd ~/Gajim +``` + +*Note: Source tarballs and snapshots do _not_ include 'org.gajim.Gajim.yaml', which is necessary for installation via Flatpak.* + +### Install Gajim and dependencies + +Replace install path `~/Gajim/gajim_flatpak` with an install path of your choice. + +*Note: Remove `--user` if you want a system-wide installation.* + +```bash +flatpak --user remote-add --from gnome https://sdk.gnome.org/gnome.flatpakrepo +flatpak --user install gnome org.gnome.Platform//3.34 +flatpak --user install gnome org.gnome.Sdk//3.34 +flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/flatpak/org.gajim.Gajim.yaml +flatpak --user remote-add --no-gpg-verify gajim_flatpak_repo gajim_flatpak_repo +flatpak --user install gajim_flatpak_repo org.gajim.Gajim +flatpak run org.gajim.Gajim +``` + +That's it, you are now running Gajim via Flatpak! + +[Migrate your profile data](#migrate-your-data) if you like. + +## How to update + +### Update Gajim's sources + +In this example, we use `git` to update the repository. You can also download the sources from our Gitlab via webbrowser. + +```bash +cd ~/Gajim +git pull --rebase +``` + +### Remove previous Flatpak directory + +```bash +rm -r ~/Gajim/gajim_flatpak +``` + +### Install and update Gajim + +```bash +flatpak-builder --repo=gajim_flatpak_repo ~/Gajim/gajim_flatpak ~/Gajim/flatpak/org.gajim.Gajim.yaml +flatpak --user update +flatpak run org.gajim.Gajim +``` + +Gajim is now updated. + +## Migrate your data + +When switching to Flatpak you might want to migrate your user data (accounts, history, ...) from your previous installation. Just copy your user data from/to the following directories: + +Copy `.local/share/gajim` -> `.var/app/org.gajim.Gajim/data/gajim` + +Copy `.config/gajim` -> `.var/app/org.gajim.Gajim/config/gajim` View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8b9da8f9ab69142848bf866254b7221… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8b9da8f9ab69142848bf866254b7221… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Client: Expose more data via propertys
by Philipp Hörist 14 Mar '20

14 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5425f7ea by lovetox at 2020-03-14T08:15:46+01:00 Client: Expose more data via propertys - - - - - bfa40738 by lovetox at 2020-03-14T13:43:51+01:00 SASL: Treat unknown error conditions as not-authorized Recommended by the RFC - - - - - 546d83b8 by lovetox at 2020-03-14T13:52:21+01:00 Client: Silence errors after login-successful signal - - - - - 2 changed files: - nbxmpp/auth.py - nbxmpp/client.py Changes: ===================================== nbxmpp/auth.py ===================================== @@ -65,6 +65,10 @@ class SASL: def set_password(self, password): self._password = password + @property + def password(self): + return self._password + def delegate(self, stanza): if stanza.getNamespace() != NS_SASL: return @@ -183,7 +187,7 @@ class SASL: def _on_failure(self, stanza): text = stanza.getTagData('text') - reason = 'unknown-error' + reason = 'not-authorized' childs = stanza.getChildren() for child in childs: name = child.getName() ===================================== nbxmpp/client.py ===================================== @@ -179,6 +179,10 @@ class Client(Observable): def set_password(self, password): self._sasl.set_password(password) + @property + def password(self): + return self._sasl.password + @property def peer_certificate(self): return self._peer_certificate, self._peer_certificate_errors @@ -256,6 +260,10 @@ class Client(Observable): self._proxy = proxy self._dispatcher.get_module('Muclumbus').set_proxy(proxy) + @property + def proxy(self): + return self._proxy + def get_bound_jid(self): return self._jid @@ -407,6 +415,9 @@ class Client(Observable): self.disconnect() def _on_parsing_error(self, _dispatcher, _signal_name, error): + if self._state == StreamState.DISCONNECTING: + # Don't notify about parsing errors if we already ended the stream + return self._disconnect_with_error(StreamError.PARSING, 'parsing-error', error) def _on_stream_end(self, _dispatcher, _signal_name, error): @@ -596,6 +607,9 @@ class Client(Observable): self._stream_authenticated = True if self._mode.is_login_test: self.notify('login-successful') + # Reset parser because we will receive a new stream header + # which will otherwise lead to a parsing error + self._dispatcher.reset_parser() self.disconnect() return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/024648852a6e772a8d4ac55… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/024648852a6e772a8d4ac55… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Update README.md
by Philipp Hörist 12 Mar '20

12 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 86064be3 by lovetox at 2020-03-12T22:37:25+01:00 Update README.md - - - - - 02464885 by lovetox at 2020-03-12T22:37:58+01:00 Update setup.cfg Remove pyOpenSSL dependency - - - - - 2 changed files: - README.md - setup.cfg Changes: ===================================== README.md ===================================== @@ -2,14 +2,15 @@ `python-nbxmpp` is a Python library that provides a way for Python applications to use the Jabber/XMPP network in a non-blocking way. This library was initially a fork of `xmpppy`, but is now using non-blocking sockets. +## Runtime Requirements + +- PyGObject +- GLib >= 2.60 +- libsoup +- precis-i18n + ## Features -* Asynchronous -* Supports ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1, DIGEST-MD5, PLAIN, and X-MESSENGER-OAUTH2 authentication mechanisms. -* Supports connection via proxies -* Supports TLS -* Supports [BOSH (XEP-0124)](https://xmpp.org/extensions/xep-0124.html) -* Supports [Stream Management (XEP-0198)](https://xmpp.org/extensions/xep-0198.html) * List of [supported XEPs](https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/Supported-XEPs-in-p… ## Starting Points @@ -26,3 +27,5 @@ Run the following: ### Usage To use python-nbxmpp, `import nbxmpp` in your application. + +or use the example client `python3 -m nbxmpp.examples.client` ===================================== setup.cfg ===================================== @@ -15,7 +15,6 @@ python_requires = >=3.5 packages = find: install_requires = precis-i18n>=1.0.0 - pyOpenSSL>=16.2 [options.packages.find] exclude = View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b714f7c468efe481f72d8bf… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b714f7c468efe481f72d8bf… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2020