Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Windows Build Instructions: Add Windows 7 compatibility hint
by Daniel Brötzmann (＠wurstsalat) 12 Oct '21

12 Oct '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b3a88167 by Daniel Brötzmann at 2021-10-12T16:15:22+00:00 Windows Build Instructions: Add Windows 7 compatibility hint - - - - - 1 changed file: - win/README.md Changes: ===================================== win/README.md ===================================== @@ -3,6 +3,7 @@ # Windows Installer We use [msys2](https://www.msys2.org/) for creating the Windows installer and development on Windows. +Please note that Windows 7 support has been dropped. ## Development View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b3a88167ffbccaa8fecb1be9689180fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b3a88167ffbccaa8fecb1be9689180fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Remove superfluous import
by Philipp Hörist (＠lovetox) 10 Oct '21

10 Oct '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 01b4b9c8 by lovetox at 2021-10-10T15:48:57+02:00 Remove superfluous import - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -35,7 +35,6 @@ from gi.repository import Gio from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Protocol -from nbxmpp.protocol import Node from nbxmpp.protocol import JID from nbxmpp.const import MessageType from nbxmpp.const import AvatarState View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/01b4b9c8a30624e20b92c479… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/01b4b9c8a30624e20b92c479… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typing hints
by Philipp Hörist (＠lovetox) 10 Oct '21

10 Oct '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5bcabd48 by lovetox at 2021-10-10T15:44:31+02:00 Fix typing hints - - - - - 3 changed files: - gajim/common/app.py - gajim/common/modules/annotations.py - gajim/common/modules/base.py Changes: ===================================== gajim/common/app.py ===================================== @@ -38,6 +38,7 @@ from collections import defaultdict import nbxmpp +from nbxmpp.idlequeue import IdleQueue from gi.repository import Gdk import gajim @@ -131,7 +132,7 @@ def __init__(self): ZEROCONF_ACC_NAME = 'Local' # These will be set in app.gui_interface. -idlequeue = None # type: nbxmpp.idlequeue.IdleQueue +idlequeue = cast(IdleQueue, None) socks5queue = None gupnp_igd = None ===================================== gajim/common/modules/annotations.py ===================================== @@ -15,8 +15,9 @@ # XEP-0145: Annotations from typing import Any -from typing import Dict # pylint: disable=unused-import +from typing import Dict from typing import Tuple +from typing import Optional from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError @@ -37,7 +38,7 @@ class Annotations(BaseModule): def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) - self._annotations = {} # type: Dict[str, AnnotationNote] + self._annotations: Dict[str, AnnotationNote] = {} def request_annotations(self) -> None: self._nbxmpp('Annotations').request_annotations( @@ -54,7 +55,7 @@ def _annotations_received(self, task: Any) -> None: for note in annotations: self._annotations[note.jid] = note - def get_note(self, jid: str) -> AnnotationNote: + def get_note(self, jid: str) -> Optional[AnnotationNote]: return self._annotations.get(jid) def set_note(self, note: AnnotationNote) -> None: ===================================== gajim/common/modules/base.py ===================================== @@ -12,9 +12,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Any # pylint: disable=unused-import -from typing import Dict # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import +from typing import Any +from typing import Dict +from typing import List import logging from functools import partial @@ -38,9 +38,9 @@ def __init__(self, con, *args, plugin=False, **kwargs): self._con = con self._account = con.name self._log = self._set_logger(plugin) - self._nbxmpp_callbacks = {} # type: Dict[str, Any] + self._nbxmpp_callbacks: Dict[str, Any] = {} self._stored_publish = None # type: Callable - self.handlers = [] # type: List[str] + self.handlers: List[StanzaHandler] = [] def _set_logger(self, plugin): logger_name = 'gajim.c.m.%s' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bcabd4896b4c8f71cc9eaac3f4a8247… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5bcabd4896b4c8f71cc9eaac3f4a8247… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Remove "one" keyword argument from getTags()
by Philipp Hörist (＠lovetox) 10 Oct '21

10 Oct '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8a8086e6 by lovetox at 2021-10-10T15:39:39+02:00 Remove "one" keyword argument from getTags() If one wants to get only the first tag getTag() should be used This change also helps for typing hints - - - - - 5fd7e953 by lovetox at 2021-10-10T15:41:50+02:00 structs: Add more typing hints - - - - - 2 changed files: - nbxmpp/simplexml.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/simplexml.py ===================================== @@ -351,9 +351,10 @@ class Node: Filter all child nodes using specified arguments as filter. Return the first found or None if not found """ - tag = self.getTags(name, attrs, namespace, one=True) - assert not isinstance(tag, list) - return tag + tags = self.getTags(name, attrs, namespace) + if not tags: + return None + return tags[0] def getTagAttr(self, tag: str, @@ -380,13 +381,12 @@ class Node: def getTags(self, name: str, attrs: Optional[Attrs] = None, - namespace: Optional[str] = None, - one: bool = False) -> Union[List[Node], Node, None]: + namespace: Optional[str] = None) -> List[Node]: """ Filter all child nodes using specified arguments as filter. Returns the list of nodes found """ - nodes = [] + nodes: List[Node] = [] for node in self.kids: if namespace and namespace != node.getNamespace(): continue @@ -398,11 +398,7 @@ class Node: break else: nodes.append(node) - if one and nodes: - return nodes[0] - if not one: - return nodes - return None + return nodes def iterTags(self, name: str, @@ -479,9 +475,9 @@ class Node: Same as getTag but if the node with specified namespace/attributes not found, creates such node and returns it """ - node = self.getTags(name, attrs, namespace=namespace, one=True) - if node: - return node + nodes = self.getTags(name, attrs, namespace=namespace) + if nodes: + return nodes[0] return self.addChild(name, attrs, namespace=namespace) def setTagAttr(self, ===================================== nbxmpp/structs.py ===================================== @@ -15,17 +15,24 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Optional from typing import Set +from typing import NamedTuple import time import random from collections import namedtuple +import dataclasses from dataclasses import dataclass from dataclasses import field from gi.repository import Soup from gi.repository import Gio +from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Protocol from nbxmpp.protocol import Node @@ -37,9 +44,15 @@ from nbxmpp.const import PresenceType from nbxmpp.const import LOCATION_DATA from nbxmpp.const import AdHocStatus -StanzaHandler = namedtuple('StanzaHandler', - 'name callback typ ns xmlns priority') -StanzaHandler.__new__.__defaults__ = ('', '', None, 50) + +class StanzaHandler(NamedTuple): + name: str + callback: Any + typ: str = '' + ns: str = '' + xmlns: Optional[str] = None + priority: int = 50 + CommonResult = namedtuple('CommonResult', 'jid') CommonResult.__new__.__defaults__ = (None,) @@ -140,32 +153,29 @@ RosterPush = namedtuple('RosterPush', 'item version') @dataclass class RosterItem: jid: JID - name: str = None - ask: str = None - subscription: str = None + name: Optional[str] = None + ask: Optional[str] = None + subscription: Optional[str] = None groups: Set[str] = field(default_factory=set) @classmethod - def from_node(cls, node): + def from_node(cls, node: Node) -> RosterItem: attrs = node.getAttrs(copy=True) jid = attrs.get('jid') if jid is None: raise Exception('jid attribute missing') jid = JID.from_string(jid) - attrs['jid'] = jid - groups = {group.getData() for group in node.getTags('group')} - attrs['groups'] = groups - return cls(**attrs) + return cls(jid=jid, + name=attrs.get('name'), + ask=attrs.get('ask'), + subscription=attrs.get('subscription'), + groups=groups) def asdict(self): - return {'jid': self.jid, - 'name': self.name, - 'ask': self.ask, - 'subscription': self.subscription, - 'groups': self.groups} + return dataclasses.asdict(self) class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/46b1d670f30822a1070d43f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/46b1d670f30822a1070d43f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.3
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

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

1 0

[Git][gajim/gajim] Pushed new tag b5b2ad4aee92074184b181ec97fbf1f900d5f4fb
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

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

1 0

[Git][gajim/gajim] Deleted tag b5b2ad4aee92074184b181ec97fbf1f900d5f4fb
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist deleted tag b5b2ad4aee92074184b181ec97fbf1f900d5f4fb at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 1.3.3
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: b5b2ad4a by lovetox at 2021-10-09T21:40:08+02:00 1.3.3 - - - - - 3 changed files: - appveyor.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== appveyor.yml ===================================== @@ -40,8 +40,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.2-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.3-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.3-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.3.3" date="2021-10-10" /> <release version="1.3.2" date="2021-04-24" /> <release version="1.3.1" date="2021-03-01" /> <release version="1.3.0" date="2021-02-08" /> ===================================== gajim/__init__.py ===================================== @@ -2,7 +2,7 @@ import sys from pathlib import Path -__version__ = "1.3.2" +__version__ = "1.3.3" IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5b2ad4aee92074184b181ec97fbf1f9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5b2ad4aee92074184b181ec97fbf1f9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: Raise nbxmpp version
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 02b8bcf4 by lovetox at 2021-10-09T21:15:20+02:00 Raise nbxmpp version - - - - - ebf1e86e by lovetox at 2021-10-09T21:27:47+02:00 Update ChangeLog - - - - - 4 changed files: - ChangeLog - README.md - gajim/gajim.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -Gajim 1.3.3 (TBA) +Gajim 1.3.3 (10 October 2021) New @@ -13,16 +13,17 @@ Gajim 1.3.3 (TBA) Bug fixes - * #10558 Fix spell checking - * #10441 Reload CSS after switching dark/light theme + * #10638 Depend on nbxmpp>=2.0.4 (CVE-2021-41055) * #10560 HTTPUpload: Raise FileError if path is not accessible - * #10545 Jingle: Fix UnboundLocalError for transports variable + * #10558 Fix spell checking * #10551 Check for gstreamer GTK plugin for AV support - * #10150 Dead key improvements - * #10478 Fix test_gui_interface testsuite + * #10545 Jingle: Fix UnboundLocalError for transports variable * #10540 Windows: Add GSSAPI dependency - * #10477 Migration routine for portable installer * #10539 Stop gdbus.exe when running uninstaller + * #10478 Fix test_gui_interface testsuite + * #10477 Migration routine for portable installer + * #10441 Reload CSS after switching dark/light theme + * #10150 Dead key improvements * Fix starting History Manager in standalone mode Gajim 1.3.2 (24 April 2021) ===================================== README.md ===================================== @@ -7,7 +7,7 @@ ### Runtime Requirements - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=2.0.3) +- python3-nbxmpp (>=2.0.4) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '2.0.3' +_MIN_NBXMPP_VER = '2.0.4' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=2.0.3 + nbxmpp>=2.0.4 packaging setuptools; python_version < '3.9' precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6dcfd7f5458189ff39aedcf916a912… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6dcfd7f5458189ff39aedcf916a912… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Raise nbxmpp version
by Philipp Hörist (＠lovetox) 09 Oct '21

09 Oct '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2206288c by lovetox at 2021-10-09T21:16:55+02:00 Raise nbxmpp version - - - - - 3 changed files: - README.md - gajim/gajim.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ ### Runtime Requirements - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=2.0.1) +- python3-nbxmpp (>=2.99.0) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '2.0.1' +_MIN_NBXMPP_VER = '2.99.0' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=2.0.1 + nbxmpp>=2.99.0 packaging setuptools; python_version < '3.9' precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2206288c88df273e07bc52315dd22b3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2206288c88df273e07bc52315dd22b3d… 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