Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: cfix: Fix typo in requirements
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7212d00a by Philipp Hörist at 2023-01-06T15:18:10+01:00 cfix: Fix typo in requirements - - - - - 1adf9f51 by Philipp Hörist at 2023-01-06T15:19:26+01:00 ci: Fix ruff version - - - - - 2 changed files: - .gitlab-ci.yml - setup.cfg Changes: ===================================== .gitlab-ci.yml ===================================== @@ -39,7 +39,7 @@ test-ruff: - changes: - "**/*.py" script: - - pip3 install ruff + - pip3 install ruff==0.0.211 - ruff . interruptible: true ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=4.0.0,5.0.0 + nbxmpp>=4.0.0,<5.0.0 packaging pillow precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88bfeba44d96a0c1659d7c447f76caf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/88bfeba44d96a0c1659d7c447f76caf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Raise required nbxmpp version to 4.0.0
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 88bfeba4 by Philipp Hörist at 2023-01-06T15:09:45+01:00 change: Raise required nbxmpp version to 4.0.0 - - - - - 4 changed files: - README.md - flatpak/org.gajim.Gajim.yaml - gajim/gajim.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -6,7 +6,7 @@ ### Runtime Requirements - [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) -- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.2.5) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=4.0.0) - [cryptography](https://pypi.org/project/cryptography/) (>=3.4.8) - [css-parser](https://pypi.org/project/css-parser/) - [keyring](https://pypi.org/project/keyring/) ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -316,11 +316,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.2.5-py3-none-any.whl + - pip3 install nbxmpp-4.0.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.5-py3-none-… - sha256: cf22414dce04efe33cee14318fc334f1a16af11d4ed48b6aa18a8a0aa98bcb20 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.0.0-py3-none-… + sha256: 95028a037abe356647cb4c6bac632691117f00c1108a939caf7186e101bd332d - name: gajim buildsystem: simple ===================================== gajim/gajim.py ===================================== @@ -32,7 +32,7 @@ import gajim.gui -_MIN_NBXMPP_VER = '3.2.5' +_MIN_NBXMPP_VER = '4.0.0' _MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.42.0' ===================================== setup.cfg ===================================== @@ -24,7 +24,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=3.2.5,<4.0.0 + nbxmpp>=4.0.0,5.0.0 packaging pillow precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88bfeba44d96a0c1659d7c447f76caf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88bfeba44d96a0c1659d7c447f76caf3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.0.0
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed new tag 4.0.0 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.0.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 6 commits: chore: Update README.md
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f1e91b86 by Philipp Hörist at 2023-01-06T14:11:46+01:00 chore: Update README.md - - - - - 7e3f72c0 by Philipp Hörist at 2023-01-06T14:12:39+01:00 change: Remove example client This is factored out into its own project https://pypi.org/project/nbxmpp-client/ - - - - - dc408e9f by Philipp Hörist at 2023-01-06T14:14:18+01:00 change: Raise required python version to 3.10 - - - - - 54ef1117 by Philipp Hörist at 2023-01-06T14:15:01+01:00 chore: Remove mypy.ini - - - - - 29aa827f by Philipp Hörist at 2023-01-06T14:41:14+01:00 chore: Move pyright config into pyproject.toml - - - - - e2070663 by Philipp Hörist at 2023-01-06T14:54:55+01:00 release: 4.0.0 - - - - - 10 changed files: - ChangeLog - README.md - − mypy.ini - nbxmpp/__init__.py - − nbxmpp/examples/__init__.py - − nbxmpp/examples/client.py - − nbxmpp/examples/client.ui - pyproject.toml - − pyrightconfig.json - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,17 @@ +nbxmpp 4.0.0 (06 Jan 2023) + + New + + * Add message reactions (XEP-0444) support + * Add HTTP module + + Change + + * Raise required python version to 3.10 + * Remove example client + * Port to libsoup3 + * XEP-0392: Update to 0.8.0 + nbxmpp 3.2.5 (26 Oct 2022) New ===================================== README.md ===================================== @@ -4,17 +4,21 @@ ## Runtime Requirements -- python >= 3.9.0 -- PyGObject -- GLib >= 2.60 -- libsoup3 -- precis-i18n -- packaging -- idna +- [Python](https://www.python.org/) (>=3.10) +- [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) +- [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) +- [libsoup3](https://libsoup.org/) +- [precis-i18n](https://pypi.org/project/precis-i18n/) +- [packaging](https://pypi.org/project/packaging/) +- [idna](https://pypi.org/project/idna/) ## Optional Runtime Requirements -- python-gssapi (for GSSAPI authentication https://pypi.org/project/gssapi/) +- [python-gssapi](https://pypi.org/project/gssapi/) GSSAPI authentication + +## Build Requirements + +- [setuptools](https://pypi.org/project/setuptools/) ## Features ===================================== mypy.ini deleted ===================================== @@ -1,14 +0,0 @@ -[mypy] -python_version = 3.9 -warn_unused_configs = True -disallow_incomplete_defs = True -allow_redefinition = True - -[mypy-gi.*] -ignore_missing_imports = True - -[mypy-precis_i18n.*] -ignore_missing_imports = True - -[mypy-idna.*] -ignore_missing_imports = True ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '3.2.5' +__version__: str = '4.0.0' ===================================== nbxmpp/examples/__init__.py deleted ===================================== ===================================== nbxmpp/examples/client.py deleted ===================================== @@ -1,299 +0,0 @@ -#!/usr/bin/python3 - -import os -import logging -import json -from pathlib import Path - -import gi - -gi.require_version('Gtk', '3.0') -gi.require_version('GLib', '2.0') -from gi.repository import Gtk -from gi.repository import GLib - -import nbxmpp -from nbxmpp.protocol import JID -from nbxmpp.client import Client -from nbxmpp.http import HTTPSession -from nbxmpp.structs import ProxyData -from nbxmpp.structs import StanzaHandler -from nbxmpp.const import ConnectionType -from nbxmpp.const import ConnectionProtocol -from nbxmpp.const import StreamError -from nbxmpp.const import Mode - -consoleloghandler = logging.StreamHandler() -log = logging.getLogger('nbxmpp') -log.setLevel('INFO') -log.addHandler(consoleloghandler) - -formatter = logging.Formatter( - '%(asctime)s %(levelname)-7s %(name)-25s %(message)s', - datefmt='%H:%M:%S') -consoleloghandler.setFormatter(formatter) - - -class Builder: - def __init__(self, filename): - file_path = Path(__file__).resolve() - ui_file_path = file_path.parent / filename - self._builder = Gtk.Builder() - self._builder.add_from_file(str(ui_file_path)) - - def __getattr__(self, name): - try: - return getattr(self._builder, name) - except AttributeError: - return self._builder.get_object(name) - - -class StanzaRow(Gtk.ListBoxRow): - def __init__(self, stanza, incoming): - Gtk.ListBoxRow.__init__(self) - color = 'red' if incoming else 'blue' - if isinstance(stanza, bytes): - stanza = str(stanza) - if not isinstance(stanza, str): - stanza = stanza.__str__(fancy=True) - stanza = GLib.markup_escape_text(stanza) - label = Gtk.Label() - label.set_markup('<span foreground="%s">%s</span>' % (color, stanza)) - label.set_xalign(0) - label.set_halign(Gtk.Align.START) - self.add(label) - self.show_all() - - -class TestClient(Gtk.Window): - def __init__(self): - Gtk.Window.__init__(self, title='Test Client') - self.set_default_size(500, 500) - - self._builder = Builder('client.ui') - self._builder.connect_signals(self) - - self.add(self._builder.grid) - - self._client = None - self._scroll_timeout = None - self._create_paths() - self._load_config() - - def _create_client(self): - self._client = Client(log_context='TEST') - self._client.set_domain(self.address.domain) - self._client.set_username(self.address.localpart) - self._client.set_resource('test') - self._client.set_http_session(HTTPSession()) - - proxy_ip = self._builder.proxy_ip.get_text() - if proxy_ip: - proxy_port = int(self._builder.proxy_port.get_text()) - proxy_host = '%s:%s' % (proxy_ip, proxy_port) - proxy = ProxyData(self._builder.proxy_type.get_active_text().lower(), - proxy_host, - self._builder.proxy_username.get_text() or None, - self._builder.proxy_password.get_text() or None) - self._client.set_proxy(proxy) - - if self._builder.login_mode.get_active(): - self._client.set_mode(Mode.LOGIN_TEST) - elif self._builder.client_mode.get_active(): - self._client.set_mode(Mode.CLIENT) - elif self._builder.register_mode.get_active(): - self._client.set_mode(Mode.REGISTER) - elif self._builder.anon_mode.get_active(): - self._client.set_mode(Mode.ANONYMOUS_TEST) - else: - raise ValueError('No mode selected') - - self._client.set_connection_types(self._get_connection_types()) - self._client.set_protocols(self._get_connection_protocols()) - - self._client.set_password(self.password) - - self._client.subscribe('resume-failed', self._on_signal) - self._client.subscribe('resume-successful', self._on_signal) - self._client.subscribe('disconnected', self._on_signal) - self._client.subscribe('connection-lost', self._on_signal) - self._client.subscribe('connection-failed', self._on_signal) - self._client.subscribe('connected', self._on_connected) - - self._client.subscribe('stanza-sent', self._on_stanza_sent) - self._client.subscribe('stanza-received', self._on_stanza_received) - - self._client.register_handler(StanzaHandler('message', self._on_message)) - - @property - def password(self): - return self._builder.password.get_text() - - @property - def address(self): - return JID.from_string(self._builder.address.get_text()) - - @property - def xml_box(self): - return self._builder.xml_box - - def scroll_to_end(self): - adj_v = self._builder.scrolledwin.get_vadjustment() - if adj_v is None: - # This can happen when the Widget is already destroyed when called - # from GLib.idle_add - self._scroll_timeout = None - return - max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - adj_v.set_value(max_scroll_pos) - - adj_h = self._builder.scrolledwin.get_hadjustment() - adj_h.set_value(0) - self._scroll_timeout = None - - def _on_signal(self, _client, signal_name, *args, **kwargs): - log.info('%s, Error: %s', signal_name, self._client.get_error()) - if signal_name == 'disconnected': - if self._client.get_error() is None: - return - domain, error, text = self._client.get_error() - if domain == StreamError.BAD_CERTIFICATE: - self._client.set_ignore_tls_errors(True) - self._client.connect() - - def _on_connected(self, _client, _signal_name): - self.send_presence() - - def _on_message(self, _stream, stanza, _properties): - log.info('Message received') - log.info(stanza.getBody()) - - def _on_stanza_sent(self, _stream, _signal_name, data): - self.xml_box.add(StanzaRow(data, False)) - self._add_scroll_timeout() - - def _on_stanza_received(self, _stream, _signal_name, data): - self.xml_box.add(StanzaRow(data, True)) - self._add_scroll_timeout() - - def _add_scroll_timeout(self): - if self._scroll_timeout is not None: - return - self._scroll_timeout = GLib.timeout_add(50, self.scroll_to_end) - - def _connect_clicked(self, *args): - if self._client is not None: - self._client.destroy() - - self._create_client() - - self._client.connect() - - def _disconnect_clicked(self, *args): - if self._client is not None: - self._client.disconnect() - - def _clear_clicked(self, *args): - self.xml_box.foreach(self._remove) - - def _on_reconnect_clicked(self, *args): - if self._client is not None: - self._client.reconnect() - - def _get_connection_types(self): - types = [] - if self._builder.directtls.get_active(): - types.append(ConnectionType.DIRECT_TLS) - if self._builder.starttls.get_active(): - types.append(ConnectionType.START_TLS) - if self._builder.plain.get_active(): - types.append(ConnectionType.PLAIN) - return types - - def _get_connection_protocols(self): - protocols = [] - if self._builder.tcp.get_active(): - protocols.append(ConnectionProtocol.TCP) - if self._builder.websocket.get_active(): - protocols.append(ConnectionProtocol.WEBSOCKET) - return protocols - - def _on_save_clicked(self, *args): - data = {} - data['jid'] = self._builder.address.get_text() - data['password'] = self._builder.password.get_text() - data['proxy_type'] = self._builder.proxy_type.get_active_text() - data['proxy_ip'] = self._builder.proxy_ip.get_text() - data['proxy_port'] = self._builder.proxy_port.get_text() - data['proxy_username'] = self._builder.proxy_username.get_text() - data['proxy_password'] = self._builder.proxy_password.get_text() - - data['directtls'] = self._builder.directtls.get_active() - data['starttls'] = self._builder.starttls.get_active() - data['plain'] = self._builder.plain.get_active() - data['tcp'] = self._builder.tcp.get_active() - data['websocket'] = self._builder.websocket.get_active() - - path = self._get_config_dir() / 'config' - with path.open('w') as fp: - json.dump(data, fp) - - def _load_config(self): - path = self._get_config_dir() / 'config' - if not path.exists(): - return - - with path.open('r') as fp: - data = json.load(fp) - - self._builder.address.set_text(data.get('jid', '')) - self._builder.password.set_text(data.get('password', '')) - self._builder.proxy_type.set_active_id(data.get('proxy_type', 'HTTP')) - self._builder.proxy_ip.set_text(data.get('proxy_ip', '')) - self._builder.proxy_port.set_text(data.get('proxy_port', '')) - self._builder.proxy_username.set_text(data.get('proxy_username', '')) - self._builder.proxy_password.set_text(data.get('proxy_password', '')) - - self._builder.directtls.set_active(data.get('directtls', False)) - self._builder.starttls.set_active(data.get('starttls', False)) - self._builder.plain.set_active(data.get('plain', False)) - self._builder.tcp.set_active(data.get('tcp', False)) - self._builder.websocket.set_active(data.get('websocket', False)) - - @staticmethod - def _get_config_dir(): - if os.name == 'nt': - return Path(os.path.join(os.environ['appdata'], 'nbxmpp')) - - expand = os.path.expanduser - base = os.getenv('XDG_CONFIG_HOME') - if base is None or base[0] != '/': - base = expand('~/.config') - return Path(os.path.join(base, 'nbxmpp')) - - def _create_paths(self): - path_ = self._get_config_dir() - if not path_.exists(): - for parent_path in reversed(path_.parents): - # Create all parent folders - # don't use mkdir(parent=True), as it ignores `mode` - # when creating the parents - if not parent_path.exists(): - print('creating %s directory' % parent_path) - parent_path.mkdir(mode=0o700) - print('creating %s directory' % path_) - path_.mkdir(mode=0o700) - - def _remove(self, item): - self.xml_box.remove(item) - item.destroy() - - def send_presence(self): - presence = nbxmpp.Presence() - self._client.send_stanza(presence) - - -win = TestClient() -win.connect("delete-event", Gtk.main_quit) -win.show_all() -Gtk.main() ===================================== nbxmpp/examples/client.ui deleted ===================================== @@ -1,564 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> -  - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">24</property> - <property name="margin-end">24</property> - <property name="margin-top">24</property> - <property name="margin-bottom">24</property> - <property name="row-spacing">12</property> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="spacing">12</property> - <property name="layout-style">start</property> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Connect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_connect_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Disconnect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_disconnect_clicked" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">Reconnect</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_on_reconnect_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="clear"> - <property name="label" translatable="yes">Clear</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <signal name="clicked" handler="_clear_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">XMPP-Address</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Password</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="address"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Host or IP</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Port</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Password</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Proxy Username</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_ip"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_username"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_port"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="proxy_password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Save</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Save</property> - <property name="halign">start</property> - <signal name="clicked" handler="_on_save_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-save-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkCheckButton" id="directtls"> - <property name="label" translatable="yes">DIRECT TLS</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="starttls"> - <property name="label" translatable="yes">START TLS</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="plain"> - <property name="label" translatable="yes">PLAIN</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Connection Type</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> - <property name="height">3</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkCheckButton" id="tcp"> - <property name="label" translatable="yes">TCP</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="websocket"> - <property name="label" translatable="yes">WEBSOCKET</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">start</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Connection Protocol</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">3</property> - <property name="height">3</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Proxy Type</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="proxy_type"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="active">0</property> - <items> - <item id="SOCKS5" translatable="yes">SOCKS5</item> - </items> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkFrame"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> - <child> - <object class="GtkAlignment"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="top-padding">12</property> - <property name="bottom-padding">12</property> - <property name="left-padding">12</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkRadioButton" id="client_mode"> - <property name="label" translatable="yes">Client</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="login_mode"> - <property name="label" translatable="yes">Login</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="register_mode"> - <property name="label" translatable="yes">Register</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="anon_mode"> - <property name="label" translatable="yes">Anyonymous</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">login_mode</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Modes</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">2</property> - <property name="top-attach">6</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwin"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="xml_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - </object> -</interface> ===================================== pyproject.toml ===================================== @@ -3,3 +3,13 @@ requires = [ "setuptools >= 43.0.0", ] build-backend = "setuptools.build_meta" + + +[tool.pyright] +pythonVersion = "3.10" +pythonPlatform = "All" +typeCheckingMode = "strict" + +reportUnnecessaryTypeIgnoreComment = "error" +reportPropertyTypeMismatch = "error" +reportMissingModuleSource = "none" ===================================== pyrightconfig.json deleted ===================================== @@ -1,4 +0,0 @@ -{ - "ignore": ["**/test", "setup.py"], - "typeCheckingMode": "strict", -} ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 3.2.5 +version = 4.0.0 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org @@ -11,10 +11,10 @@ url = https://dev.gajim.org/gajim/python-nbxmpp license_file = COPYING license = GPL v3 classifiers = - Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 [options] -python_requires = >=3.9 +python_requires = >=3.10 packages = find: install_requires = precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/964fa149cf0502bdb43b561… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/964fa149cf0502bdb43b561… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Run isort check
by Philipp Hörist (＠lovetox) 06 Jan '23

06 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: c0256ec6 by Philipp Hörist at 2023-01-06T10:33:08+01:00 ci: Run isort check - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -43,6 +43,16 @@ test-ruff: - ruff . interruptible: true +test-isort: + stage: test + rules: + - changes: + - "**/*.py" + script: + - pip3 install isort + - isort --check . + interruptible: true + test-unittest: stage: test script: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0256ec65e4fcc7b1a5b10d0453f7d99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c0256ec65e4fcc7b1a5b10d0453f7d99… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: chore: Update .gitignore
by Philipp Hörist (＠lovetox) 05 Jan '23

05 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: bfa05b72 by Philipp Hörist at 2023-01-05T20:05:13+01:00 chore: Update .gitignore - - - - - 5a9012d7 by Philipp Hörist at 2023-01-05T20:31:53+01:00 refactor: Plugins: Move plugin events into own module This avoids import cycles - - - - - 015662ba by Philipp Hörist at 2023-01-05T20:55:32+01:00 refactor: Plugins: Use relative imports This avoids import circles - - - - - 7c1a0047 by Philipp Hörist at 2023-01-05T21:14:11+01:00 refactor: Rows: Move click handler into message module This avoids import circles - - - - - 11 changed files: - .gitignore - gajim/common/events.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/plugins.py - + gajim/plugins/events.py - gajim/plugins/gajimplugin.py - gajim/plugins/helpers.py - gajim/plugins/manifest.py - gajim/plugins/pluginmanager.py - gajim/plugins/repository.py Changes: ===================================== .gitignore ===================================== @@ -33,3 +33,5 @@ node_modules/ # IDE files .vscode +*.sublime-project +*.sublime-workspace ===================================== gajim/common/events.py ===================================== @@ -45,7 +45,6 @@ if typing.TYPE_CHECKING: from gajim.common.client import Client from gajim.common.modules.httpupload import HTTPFileTransfer - from gajim.plugins.manifest import PluginManifest ChatListEventT = Union[ 'MessageReceived', @@ -451,18 +450,6 @@ class RosterPush(ApplicationEvent): item: RosterItem -@dataclass -class PluginAdded(ApplicationEvent): - name: str = field(init=False, default='plugin-added') - manifest: PluginManifest - - -@dataclass -class PluginRemoved(ApplicationEvent): - name: str = field(init=False, default='plugin-removed') - manifest: PluginManifest - - @dataclass class SearchFormReceivedEvent(ApplicationEvent): name: str = field(init=False, default='search-form-received') ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -43,9 +43,11 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT +from gajim.gtk.menus import get_chat_row_menu from ...preview import PreviewWidget from ...util import format_fingerprint +from ...util import GajimPopover from ..message_widget import MessageWidget from .base import BaseRow from .widgets import AvatarBox @@ -186,7 +188,7 @@ def __init__(self, self._bottom_box.set_halign(Gtk.Align.END) self._message_widget.set_direction(Gtk.TextDirection.RTL) - more_menu_button = MoreMenuButton(self, self._contact, name) + more_menu_button = MoreMenuButton(self._on_more_menu_button_clicked) self._bottom_box.pack_end(more_menu_button, False, True, 0) self.grid.attach(self._avatar_box, 0, 0, 1, 2) @@ -195,6 +197,19 @@ def __init__(self, self.show_all() + def _on_more_menu_button_clicked(self, button: Gtk.Button) -> None: + menu = get_chat_row_menu( + self._contact, + self.name, + self.get_text(), + self.timestamp, + self.message_id, + self.stanza_id, + self.log_line_id) + + popover = GajimPopover(menu, relative_to=button) + popover.popup() + def enable_selection_mode(self) -> None: if isinstance(self._message_widget, MessageWidget): self._message_widget.set_selectable(False) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -14,8 +14,9 @@ from __future__ import annotations +from typing import Any +from typing import Callable from typing import Optional -from typing import TYPE_CHECKING from datetime import datetime @@ -31,10 +32,6 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT -if TYPE_CHECKING: - from .message import MessageRow - -from ...menus import get_chat_row_menu from ...menus import get_groupchat_participant_menu from ...util import GajimPopover from ...util import get_cursor @@ -52,11 +49,7 @@ def __init__(self) -> None: @wrap_with_event_box class MoreMenuButton(Gtk.Button): - def __init__(self, - row: MessageRow, - contact: ChatContactT, - name: str - ) -> None: + def __init__(self, on_click_handler: Callable[[Gtk.Button], Any]) -> None: Gtk.Button.__init__(self) self.set_valign(Gtk.Align.START) @@ -66,27 +59,10 @@ def __init__(self, self.get_style_context().add_class('conversation-more-button') - self._row = row - self._contact = contact - self._name = name - image = Gtk.Image.new_from_icon_name( 'feather-more-horizontal-symbolic', Gtk.IconSize.BUTTON) self.add(image) - self.connect('clicked', self._on_click) - - def _on_click(self, _button: Gtk.Button) -> None: - menu = get_chat_row_menu( - self._contact, - self._name, - self._row.get_text(), - self._row.timestamp, - self._row.message_id, - self._row.stanza_id, - self._row.log_line_id) - - popover = GajimPopover(menu, relative_to=self) - popover.popup() + self.connect('clicked', on_click_handler) class DateTimeLabel(Gtk.Label): ===================================== gajim/gtk/plugins.py ===================================== @@ -30,8 +30,6 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import ged -from gajim.common.events import PluginAdded -from gajim.common.events import PluginRemoved from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -43,6 +41,8 @@ from gajim.gui.filechoosers import ArchiveChooserDialog from gajim.gui.util import EventHelper from gajim.gui.util import load_icon_pixbuf +from gajim.plugins.events import PluginAdded +from gajim.plugins.events import PluginRemoved from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.manifest import PluginManifest ===================================== gajim/plugins/events.py ===================================== @@ -0,0 +1,33 @@ +# 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, either version 3 of the License, or +# (at your option) any later version. +# +# 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/>. + +from dataclasses import dataclass +from dataclasses import field + +from gajim.common.events import ApplicationEvent + +from .manifest import PluginManifest + + +@dataclass +class PluginAdded(ApplicationEvent): + name: str = field(init=False, default='plugin-added') + manifest: PluginManifest + + +@dataclass +class PluginRemoved(ApplicationEvent): + name: str = field(init=False, default='plugin-removed') + manifest: PluginManifest ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -25,7 +25,8 @@ from gajim.common.ged import HandlerFuncT from gajim.common.modules.base import BaseModule from gajim.common.types import PluginExtensionPoints -from gajim.plugins.manifest import PluginManifest + +from .manifest import PluginManifest log = logging.getLogger('gajim.p.plugin') ===================================== gajim/plugins/helpers.py ===================================== @@ -18,7 +18,9 @@ from gajim.common import configpaths from gajim.gui.builder import Builder -from gajim.plugins import plugins_i18n + +from .plugins_i18n import _ +from .plugins_i18n import DOMAIN class GajimPluginActivateException(Exception): @@ -30,8 +32,8 @@ class GajimPluginActivateException(Exception): def get_builder(file_name: str, widgets: Optional[list[str]] = None) -> Builder: return Builder(file_name, # pyright: ignore widgets, - domain=plugins_i18n.DOMAIN, - gettext_=plugins_i18n._) + domain=DOMAIN, + gettext_=_) def is_shipped_plugin(path: Path) -> bool: ===================================== gajim/plugins/manifest.py ===================================== @@ -26,8 +26,9 @@ from packaging.version import Version as V import gajim -from gajim.plugins.helpers import is_shipped_plugin -from gajim.plugins.plugins_i18n import _ as p_ + +from .helpers import is_shipped_plugin +from .plugins_i18n import _ as p_ BLOCKED_PLUGINS = [ 'appindicator_integration', ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -33,16 +33,17 @@ from gajim.common import configpaths from gajim.common import modules from gajim.common.client import Client -from gajim.common.events import PluginAdded -from gajim.common.events import PluginRemoved from gajim.common.exceptions import PluginsystemError from gajim.common.i18n import _ from gajim.common.util.classes import Singleton -from gajim.plugins.gajimplugin import GajimPlugin -from gajim.plugins.gajimplugin import GajimPluginException -from gajim.plugins.helpers import GajimPluginActivateException -from gajim.plugins.helpers import is_shipped_plugin -from gajim.plugins.manifest import PluginManifest + +from .events import PluginAdded +from .events import PluginRemoved +from .gajimplugin import GajimPlugin +from .gajimplugin import GajimPluginException +from .helpers import GajimPluginActivateException +from .helpers import is_shipped_plugin +from .manifest import PluginManifest log = logging.getLogger('gajim.p.manager') ===================================== gajim/plugins/repository.py ===================================== @@ -29,7 +29,8 @@ from gajim.common import configpaths from gajim.common.helpers import Observable from gajim.common.util.http import create_http_request -from gajim.plugins.manifest import PluginManifest + +from .manifest import PluginManifest log = logging.getLogger('gajim.p.repository') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b81e8ac8d72ae21e1ffc5095929e34a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b81e8ac8d72ae21e1ffc5095929e34a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update pre-commit deps
by Philipp Hörist (＠lovetox) 05 Jan '23

05 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8f4f934 by Philipp Hörist at 2023-01-05T19:44:33+01:00 chore: Update pre-commit deps - - - - - b81e8ac8 by Philipp Hörist at 2023-01-05T19:55:27+01:00 refactor: Simplify yield and any() checks - - - - - 28 changed files: - .pre-commit-config.yaml - gajim/common/configpaths.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/roster.py - gajim/common/storage/archive.py - gajim/gtk/chat_list_stack.py - gajim/gtk/conversation/jump_to_end_button.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/command_output.py - gajim/gtk/conversation/rows/file_transfer.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/user_status.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_affiliation.py - gajim/gtk/groupchat_outcasts.py - gajim/gtk/preferences.py - gajim/gui/__init__.py - gajim/plugins/gajimplugin.py - gajim/plugins/manifest.py - pyproject.toml Changes: ===================================== .pre-commit-config.yaml ===================================== @@ -1,6 +1,6 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.206 + rev: v0.0.211 hooks: - id: ruff exclude: ".githooks/" @@ -15,7 +15,7 @@ repos: - tomli - repo: https://github.com/RobertCraigie/pyright-python - rev: v1.1.286 + rev: v1.1.287 hooks: - id: pyright pass_filenames: false ===================================== gajim/common/configpaths.py ===================================== @@ -144,8 +144,7 @@ def __getitem__(self, key: str) -> Path: return path def items(self) -> Generator[tuple[str, PathTupleT], None, None]: - for key, value in self._paths.items(): - yield (key, value) + yield from self._paths.items() def _prepare(self, path: Path, unique: bool) -> Path: if os.name == 'nt': ===================================== gajim/common/helpers.py ===================================== @@ -1422,10 +1422,7 @@ def warn_about_plain_connection(account: str, ) -> bool: warn = app.settings.get_account_setting( account, 'confirm_unencrypted_connection') - for type_ in connection_types: - if type_.is_plain and warn: - return True - return False + return any(type_.is_plain and warn for type_ in connection_types) def get_idle_status_message(state: str, status_message: str) -> str: ===================================== gajim/common/modules/contacts.py ===================================== @@ -351,10 +351,8 @@ def is_self(self): return own_jid == self.jid def supports(self, requested_feature: str) -> bool: - for resource in self.iter_resources(): - if resource.supports(requested_feature): - return True - return False + return any(resource.supports(requested_feature) + for resource in self.iter_resources()) def supports_audio(self) -> bool: if (self.supports(Namespace.JINGLE_ICE_UDP) and @@ -600,10 +598,8 @@ def is_phone(self): if disco_info is None: return False - for identity in disco_info.identities: - if identity.type == 'phone': - return True - return False + return any(identity.type == 'phone' for + identity in disco_info.identities) @property def is_available(self) -> bool: ===================================== gajim/common/modules/roster.py ===================================== @@ -204,8 +204,7 @@ def change_group(self, jid: JID, old_group: str, new_group: str) -> None: self._nbxmpp('Roster').set_item(jid, item.name, groups) def iter(self) -> Iterator[tuple[JID, RosterItem]]: - for jid, data in self._roster.items(): - yield jid, data + yield from self._roster.items() def iter_contacts(self) -> Iterator[BareContact]: for jid in self._roster: ===================================== gajim/common/storage/archive.py ===================================== @@ -1367,8 +1367,7 @@ def get_messages_for_export(self, results = cursor.fetchmany(10) if not results: break - for result in results: - yield result + yield from results def remove_history(self, account: str, jid: JID) -> None: ''' ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -309,10 +309,8 @@ def find_chat(self, account: str, jid: JID) -> Optional[ChatList]: def contains_chat(self, account: str, jid: JID, workspace_id: Optional[str] = None) -> bool: if workspace_id is None: - for chat_list in self._chat_lists.values(): - if chat_list.contains_chat(account, jid): - return True - return False + return any(chat_list.contains_chat(account, jid) for + chat_list in self._chat_lists.values()) chat_list = self._chat_lists[workspace_id] return chat_list.contains_chat(account, jid) ===================================== gajim/gtk/conversation/jump_to_end_button.py ===================================== @@ -19,10 +19,9 @@ from gi.repository import GObject from gi.repository import Gtk +from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant -from gajim.common.modules.contacts import BareContact - ContactT = Union[BareContact, GroupchatContact, GroupchatParticipant] ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -14,22 +14,21 @@ from __future__ import annotations +from typing import cast from typing import Optional from typing import Union -from typing import cast from gi.repository import Gtk -from gajim.common.styling import process from gajim.common.styling import ParsingResult from gajim.common.styling import PlainBlock from gajim.common.styling import PreBlock +from gajim.common.styling import process from gajim.common.styling import QuoteBlock from .code_widget import CodeWidget -from .quote_widget import QuoteWidget from .plain_widget import PlainWidget - +from .quote_widget import QuoteWidget ContentT = Union[ParsingResult, QuoteBlock] ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -16,10 +16,10 @@ import logging -from gi.repository import Gtk -from gi.repository import Pango from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -31,10 +31,10 @@ from gajim.common.jingle_session import JingleSession from gajim.common.storage.archive import ConversationRow +from .base import BaseRow from .widgets import DateTimeLabel from .widgets import NicknameLabel from .widgets import SimpleLabel -from .base import BaseRow class CallRow(BaseRow): ===================================== gajim/gtk/conversation/rows/command_output.py ===================================== @@ -20,9 +20,9 @@ from gajim.common.const import AvatarSize +from .base import BaseRow from .widgets import DateTimeLabel from .widgets import SimpleLabel -from .base import BaseRow class CommandOutputRow(BaseRow): ===================================== gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -26,12 +26,12 @@ from gajim.common.i18n import _ from gajim.common.modules.httpupload import HTTPFileTransfer -from .base import BaseRow -from .widgets import DateTimeLabel +from ...builder import get_builder from ...dialogs import ErrorDialog from ...util import EventHelper -from ...builder import get_builder from ...util import format_eta +from .base import BaseRow +from .widgets import DateTimeLabel class FileTransferRow(BaseRow, EventHelper): ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -14,8 +14,8 @@ from __future__ import annotations -from typing import Union from typing import Optional +from typing import Union import logging import time @@ -30,14 +30,14 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant -from gajim.common.events import FileRequestReceivedEvent -from gajim.common.events import FileRequestSent from gajim.common.events import FileCompleted -from gajim.common.events import FileProgress from gajim.common.events import FileError from gajim.common.events import FileHashError -from gajim.common.events import FileSendError +from gajim.common.events import FileProgress from gajim.common.events import FileRequestError +from gajim.common.events import FileRequestReceivedEvent +from gajim.common.events import FileRequestSent +from gajim.common.events import FileSendError from gajim.common.events import JingleErrorReceived from gajim.common.events import JingleFtCancelledReceived from gajim.common.file_props import FileProp @@ -48,11 +48,11 @@ from gajim.common.modules.contacts import BareContact from gajim.common.storage.archive import ConversationRow +from ...builder import get_builder +from ...util import format_eta from .base import BaseRow from .widgets import DateTimeLabel from .widgets import NicknameLabel -from ...builder import get_builder -from ...util import format_eta TransferEventT = Union[FileRequestReceivedEvent, FileRequestSent] ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -23,9 +23,9 @@ from gajim.common.const import AvatarSize +from .base import BaseRow from .widgets import DateTimeLabel from .widgets import SimpleLabel -from .base import BaseRow class InfoMessage(BaseRow): ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -17,17 +17,15 @@ from typing import Optional from typing import Union +import textwrap from datetime import datetime from datetime import timedelta -import textwrap +import cairo from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gtk from gi.repository import Pango - -import cairo - from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking from nbxmpp.structs import CommonError @@ -46,16 +44,15 @@ from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT +from ...preview import PreviewWidget +from ...util import format_fingerprint +from ..message_widget import MessageWidget from .base import BaseRow from .widgets import AvatarBox from .widgets import DateTimeLabel -from .widgets import NicknameLabel from .widgets import MessageIcons from .widgets import MoreMenuButton -from ..message_widget import MessageWidget -from ...preview import PreviewWidget -from ...util import format_fingerprint - +from .widgets import NicknameLabel MERGE_TIMEFRAME = timedelta(seconds=120) ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -19,12 +19,12 @@ from gi.repository import Gtk -from gajim.common.i18n import _ from gajim.common.const import AvatarSize +from gajim.common.i18n import _ -from .widgets import SimpleLabel -from .widgets import DateTimeLabel from .base import BaseRow +from .widgets import DateTimeLabel +from .widgets import SimpleLabel class MUCJoinLeft(BaseRow): ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -25,9 +25,9 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ +from ..message_widget import MessageWidget from .base import BaseRow from .widgets import DateTimeLabel -from ..message_widget import MessageWidget class MUCSubject(BaseRow): ===================================== gajim/gtk/conversation/rows/user_status.py ===================================== @@ -21,15 +21,15 @@ from gi.repository import Gtk -from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.helpers import get_uf_show +from gajim.common.i18n import _ -from .widgets import SimpleLabel -from .widgets import DateTimeLabel -from .base import BaseRow -from ..message_widget import MessageWidget from ...avatar import get_show_circle +from ..message_widget import MessageWidget +from .base import BaseRow +from .widgets import DateTimeLabel +from .widgets import SimpleLabel class UserStatus(BaseRow): ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -14,16 +14,16 @@ from __future__ import annotations -from typing import TYPE_CHECKING from typing import Optional +from typing import TYPE_CHECKING from datetime import datetime -from gi.repository import Gtk +import cairo from gi.repository import Gdk -from gi.repository import Pango from gi.repository import GLib -import cairo +from gi.repository import Gtk +from gi.repository import Pango from gajim.common import app from gajim.common.const import AvatarSize @@ -36,9 +36,9 @@ from ...menus import get_chat_row_menu from ...menus import get_groupchat_participant_menu -from ...util import wrap_with_event_box -from ...util import get_cursor from ...util import GajimPopover +from ...util import get_cursor +from ...util import wrap_with_event_box class SimpleLabel(Gtk.Label): ===================================== gajim/gtk/conversation/view.py ===================================== @@ -15,53 +15,51 @@ from __future__ import annotations from typing import Any +from typing import cast +from typing import Generator from typing import Literal from typing import Optional from typing import Union -from typing import Generator -from typing import cast import logging import time - from datetime import datetime from datetime import timedelta from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import GObject from gi.repository import Gio - +from gi.repository import GObject +from gi.repository import Gtk from nbxmpp.errors import StanzaError from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.protocol import JID from nbxmpp.structs import CommonError from nbxmpp.structs import MucSubject -from nbxmpp.protocol import JID from gajim.common import app -from gajim.common import types from gajim.common import events +from gajim.common import types from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day +from gajim.common.helpers import to_user_string +from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow -from gajim.common.modules.contacts import BareContact from gajim.common.types import ChatContactT from .rows.base import BaseRow -from .rows.read_marker import ReadMarkerRow -from .rows.scroll_hint import ScrollHintRow -from .rows.message import MessageRow -from .rows.info import InfoMessage from .rows.call import CallRow from .rows.command_output import CommandOutputRow from .rows.date import DateRow from .rows.file_transfer import FileTransferRow from .rows.file_transfer_jingle import FileTransferJingleRow -from .rows.muc_subject import MUCSubject +from .rows.info import InfoMessage +from .rows.message import MessageRow from .rows.muc_join_left import MUCJoinLeft +from .rows.muc_subject import MUCSubject +from .rows.read_marker import ReadMarkerRow +from .rows.scroll_hint import ScrollHintRow from .rows.user_status import UserStatus log = logging.getLogger('gajim.gui.conversation_view') @@ -701,8 +699,7 @@ def get_row_by_stanza_id(self, stanza_id: str) -> Optional[MessageRow]: return None def iter_rows(self) -> Generator[BaseRow, None, None]: - for row in cast(list[BaseRow], self._list_box.get_children()): - yield row + yield from cast(list[BaseRow], self._list_box.get_children()) def remove_rows_by_type(self, row_type: str) -> None: for row in self.iter_rows(): ===================================== gajim/gtk/groupchat_affiliation.py ===================================== @@ -179,10 +179,7 @@ def _on_selection_changed(self, tree_selection: Gtk.TreeSelection) -> None: self._set_remove_button_state(sensitive, selected_affiliations) def _jid_exists(self, jid: str) -> bool: - for row in self._store: - if row[Column.JID] == jid: - return True - return False + return any(row[Column.JID] == jid for row in self._store) @staticmethod def _get_selected_affiliations(tree_selection: Gtk.TreeSelection ===================================== gajim/gtk/groupchat_outcasts.py ===================================== @@ -144,10 +144,7 @@ def _on_selection_changed(self, tree_selection: Gtk.TreeSelection) -> None: self._set_remove_button_state(sensitive) def _jid_exists(self, jid: str) -> bool: - for row in self._store: - if row[Column.JID] == jid: - return True - return False + return any(row[Column.JID] == jid for row in self._store) def _set_remove_button_state(self, sensitive: bool) -> None: value = self._own_affiliation in ('admin', 'owner') ===================================== gajim/gtk/preferences.py ===================================== @@ -916,10 +916,7 @@ def update_proxy_list(self) -> None: popover_row.update_entries(self._get_proxies()) def _check_hints_reset(self) -> bool: - for hint in self._hints_list: - if app.settings.get(hint) is False: - return True - return False + return any(app.settings.get(hint) is False for hint in self._hints_list) def _on_reset_hints(self, button: Gtk.Button) -> None: for hint in self._hints_list: ===================================== gajim/gui/__init__.py ===================================== @@ -1,15 +1,15 @@ from __future__ import annotations -from typing import Union -from typing import Sequence from typing import Optional +from typing import Sequence +from typing import Union -import types import sys +import types from importlib.abc import MetaPathFinder -from importlib.util import spec_from_file_location from importlib.machinery import ModuleSpec +from importlib.util import spec_from_file_location from pathlib import Path ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -146,8 +146,7 @@ def __contains__(self, key: str) -> bool: return key in self.data def __iter__(self): - for key in self.data: - yield key + yield from self.data def keys(self): return self.data.keys() ===================================== gajim/plugins/manifest.py ===================================== @@ -98,10 +98,7 @@ def from_path(cls, path: Path) -> PluginManifest: return cls.from_manifest_json(manifest, manifest_path) def _check_requirements(self) -> bool: - for req in self.requirements: - if GAJIM_VERSION in req.specifier: - return True - return False + return any(GAJIM_VERSION in req.specifier for req in self.requirements) @classmethod def from_manifest_json(cls, ===================================== pyproject.toml ===================================== @@ -133,6 +133,8 @@ ignore = [ "RUF003", # AmbiguousUnicodeCharacterComment "RUF100", # Unused `noqa` directive "S101", # Use of `assert` detected + "SIM102", # Use a single `if` statement instead of nested `if` statements + "SIM105", # Use `contextlib.suppress(Exception)` instead of try-except-pass "UP007", # Use X | Y for type annotations ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bf7824ae18dbd9b83b297d5ecedaeff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bf7824ae18dbd9b83b297d5ecedaeff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CertificateBox: Format serial number in hex
by Daniel Brötzmann (＠wurstsalat) 05 Jan '23

05 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bf7824ae by wurstsalat at 2023-01-05T17:16:16+01:00 fix: CertificateBox: Format serial number in hex Fixes #11335 - - - - - 1 changed file: - gajim/gtk/certificate_dialog.py Changes: ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -75,12 +75,10 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: if dotted_string == '2.5.4.11': self._ib_org_unit = str(attribute.value) - it_serial_no = str(cert.serial_number) - it_serial_no_half = int(len(it_serial_no) / 2) - self._it_serial_number = '%s\n%s' % ( - it_serial_no[:it_serial_no_half], - it_serial_no[it_serial_no_half:]) - + serial_str = '0{:02X}'.format(cert.serial_number) + serial_str_foratted = ':'.join( + map('{}{}'.format, *(serial_str[::2], serial_str[1::2]))) + self._it_serial_number = serial_str_foratted self._ib_common_name = '' self._ib_organization = '' self._ib_org_unit = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7824ae18dbd9b83b297d5ecedaeff5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7824ae18dbd9b83b297d5ecedaeff5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Flatpak: Update dependencies
by André (＠andre) 05 Jan '23

05 Jan '23

André pushed to branch master at gajim / gajim Commits: 88b9c97d by André Apitzsch at 2023-01-05T13:30:39+01:00 chore: Flatpak: Update dependencies - - - - - 3 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - flatpak/shared-modules Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -73,11 +73,11 @@ modules: - name: python3-packaging buildsystem: simple build-commands: - - pip3 install packaging-21.3-py3-none-any.whl + - pip3 install packaging-22.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-… - sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-22.0-py3-… + sha256: 957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3 - name: python3-pycparser buildsystem: simple @@ -120,22 +120,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: 50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… + sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… + sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b - name: python3-dbus-python build-options: @@ -190,11 +190,11 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-5.1.0-py3-none-any.whl + - pip3 install importlib_metadata-6.0.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad - name: python3-jaraco.classes buildsystem: simple @@ -210,13 +210,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.11.0-py3-none-any.whl + - pip3 install keyring-23.13.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.11.0-py3-n… - sha256: 3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.13.1-py3-n… + sha256: 771ed2a91909389ed6148631de678f82ddc73737d85a927f382a8a1b157898cd - name: python3-css-parser buildsystem: simple @@ -230,11 +230,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install precis_i18n-1.0.4-py3-none-any.whl + - pip3 install precis_i18n-1.0.5-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.4… - sha256: 8b4f6100c2f5e44db61081d53c9c07ff92e50d0a7b36eedd2f4fb7d40c48576d + url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.5… + sha256: 14eceeae73dc7bbd1c4a17d2ac7143db87d65ded98eec44c47911270812862a3 # GSound dependency - shared-modules/libcanberra/libcanberra.json @@ -269,8 +269,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.3.0.tar.gz - sha256: c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz + sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e # sentry-sdk dependency - name: python3-urllib3 @@ -285,20 +285,20 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.9.24-py3-none-any.whl + - pip3 install certifi-2022.12.7-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.24-py3… - sha256: 90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.12.7-py3… + sha256: 4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.11.1-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.12.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 9f0b960694e2d8bb04db4ba6ac2a645040caef4e762c65937998ff06064f10d6 # gssapi dependency - name: python3-decorator @@ -334,7 +334,8 @@ modules: - pip3 install --no-build-isolation . - touch /app/share/run-as-flatpak - cp -t ${FLATPAK_DEST} app-overrides.json - - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel + - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' + > /app/bin/gajim-devel - chmod 755 /app/bin/gajim-devel sources: - type: git ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -66,11 +66,11 @@ modules: - name: python3-packaging buildsystem: simple build-commands: - - pip3 install packaging-21.3-py3-none-any.whl + - pip3 install packaging-22.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-… - sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-22.0-py3-… + sha256: 957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3 - name: python3-pycparser buildsystem: simple @@ -113,22 +113,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: 50a1494ed0c3f5b4d07650a68cd6ca62efe8b596ce743a5c94403e6f11bf06c1 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… + sha256: 6f97109336df5c178ee7c9c711b264c502b905c2d2a29ace99ed761533a3460f - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-38.0.4-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-39.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… - sha256: a10498349d4c8eab7357a8f9aa3463791292845b79597ad1b98a543686fb1ec8 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-39… + sha256: 1a6915075c6d3a5e1215eab5d99bcec0da26036ff2102a1038401d6ef5bef25b - name: python3-dbus-python build-options: @@ -183,11 +183,11 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-5.1.0-py3-none-any.whl + - pip3 install importlib_metadata-6.0.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: d84d17e21670ec07990e1044a99efe8d615d860fd176fc29ef5c306068fda313 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 7efb448ec9a5e313a57655d35aa54cd3e01b7e1fbcf72dce1bf06119420f5bad - name: python3-jaraco.classes buildsystem: simple @@ -203,13 +203,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.11.0-py3-none-any.whl + - pip3 install keyring-23.13.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.11.0-py3-n… - sha256: 3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.13.1-py3-n… + sha256: 771ed2a91909389ed6148631de678f82ddc73737d85a927f382a8a1b157898cd - name: python3-css-parser buildsystem: simple @@ -223,11 +223,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install precis_i18n-1.0.4-py3-none-any.whl + - pip3 install precis_i18n-1.0.5-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.4… - sha256: 8b4f6100c2f5e44db61081d53c9c07ff92e50d0a7b36eedd2f4fb7d40c48576d + url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.5… + sha256: 14eceeae73dc7bbd1c4a17d2ac7143db87d65ded98eec44c47911270812862a3 # GSound dependency - shared-modules/libcanberra/libcanberra.json @@ -262,8 +262,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.3.0.tar.gz - sha256: c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.4.0.tar.gz + sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e # sentry-sdk dependency - name: python3-urllib3 @@ -278,20 +278,20 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2022.9.24-py3-none-any.whl + - pip3 install certifi-2022.12.7-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.9.24-py3… - sha256: 90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.12.7-py3… + sha256: 4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.11.1-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.12.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… - sha256: 8b4ff696c0bdcceb3f70bbb87a57ba84fd3168b1332d493fcd16c137f709578c + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.1… + sha256: 9f0b960694e2d8bb04db4ba6ac2a645040caef4e762c65937998ff06064f10d6 # gssapi dependency - name: python3-decorator ===================================== flatpak/shared-modules ===================================== @@ -1 +1 @@ -Subproject commit 39152375ffaa13de4d1e5d0fe97120ddcb1e30c6 +Subproject commit e759506ce55f932dab79fb0ca40934a3d4608cb3 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88b9c97da389df32f965df7aa27df7dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/88b9c97da389df32f965df7aa27df7dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MessageActionsBox: Restore emoji button behavior
by Daniel Brötzmann (＠wurstsalat) 05 Jan '23

05 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cee802f2 by wurstsalat at 2023-01-05T12:02:51+01:00 fix: MessageActionsBox: Restore emoji button behavior Fixes #11350 - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -153,6 +153,7 @@ def _on_action(self, elif action_name == 'show-emoji-chooser': self.msg_textview.emit('insert-emoji') + self._ui.emoticons_button.set_active(False) elif action_name == 'quote': assert param View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cee802f228ffe554961f78358844d88f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cee802f228ffe554961f78358844d88f… 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