Philipp Hörist pushed to branch master at gajim / gajim
Commits: e1d063f2 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Remove obsolete method
- - - - - cf0c1981 by Philipp Hörist at 2023-05-20T20:13:13+02:00 refactor: Use helper methods to determine lib versions
- - - - - c0c723e1 by Philipp Hörist at 2023-05-20T20:13:13+02:00 cfix: Add soup version to exception text
- - - - -
4 changed files:
- gajim/common/helpers.py - gajim/common/storage/omemo.py - gajim/gtk/about.py - gajim/gtk/exception.py
Changes:
===================================== gajim/common/helpers.py ===================================== @@ -68,6 +68,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject +from gi.repository import Soup from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import ConnectionProtocol @@ -1552,6 +1553,12 @@ def get_glib_version() -> str: GLib.MICRO_VERSION]))
+def get_soup_version() -> str: + return '.'.join(map(str, [Soup.get_major_version(), + Soup.get_minor_version(), + Soup.get_micro_version()])) + + def package_version(requirement: str) -> bool: req = Requirement(requirement)
===================================== gajim/common/storage/omemo.py ===================================== @@ -37,7 +37,6 @@ from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord from omemo_dr.state.store import Store from omemo_dr.structs import IdentityInfo -from omemo_dr.util.medium import Medium
from gajim.common import app from gajim.common.modules.util import LogAdapter @@ -395,10 +394,6 @@ def remove_signed_pre_key(self, signed_pre_key_id: int) -> None: self._con.execute(query, (signed_pre_key_id,)) self._con.commit()
- def get_next_signed_pre_key_id(self) -> int: - result = self.get_current_signed_pre_key_id() - return (result % (Medium.MAX_VALUE - 1)) + 1 - def get_current_signed_pre_key_id(self) -> int: query = 'SELECT MAX(prekey_id) FROM signed_prekeys' result = self._con.execute(query).fetchone()
===================================== gajim/gtk/about.py ===================================== @@ -15,20 +15,22 @@ import cairo import nbxmpp from gi.repository import Gdk -from gi.repository import GLib -from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango -from gi.repository import Soup
from gajim.common import app from gajim.common.const import ARTISTS from gajim.common.const import DEVS_CURRENT from gajim.common.const import DEVS_PAST from gajim.common.const import THANKS +from gajim.common.helpers import get_glib_version +from gajim.common.helpers import get_gobject_version +from gajim.common.helpers import get_soup_version from gajim.common.helpers import open_uri from gajim.common.i18n import _
+from gajim.gtk.util import get_gtk_version +
class AboutDialog(Gtk.AboutDialog): def __init__(self): @@ -40,32 +42,20 @@ def __init__(self): self.set_license_type(Gtk.License.GPL_3_0_ONLY) self.set_website('https://gajim.org/')
- gtk_ver = '%i.%i.%i' % ( - Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, - GLib.MINOR_VERSION, - GLib.MICRO_VERSION])) cairo_ver = cairo.cairo_version_string() python_cairo_ver = cairo.version
- soup_ver = '.'.join(map(str, [Soup.get_major_version(), - Soup.get_minor_version(), - Soup.get_micro_version()])) - comments: list[str] = [] comments.append(_('A fully-featured XMPP chat client')) comments.append('') - comments.append(_('GTK Version: %s') % gtk_ver) - comments.append(_('GLib Version: %s') % glib_ver) + comments.append(_('GTK Version: %s') % get_gtk_version()) + comments.append(_('GLib Version: %s') % get_glib_version()) comments.append(_('Pango Version: %s') % Pango.version_string()) - comments.append(_('PyGObject Version: %s') % gobject_ver) + comments.append(_('PyGObject Version: %s') % get_gobject_version()) comments.append(_('cairo Version: %s') % cairo_ver) comments.append(_('pycairo Version: %s') % python_cairo_ver) comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) - comments.append(_('libsoup Version: %s') % soup_ver) + comments.append(_('libsoup Version: %s') % get_soup_version())
self.set_comments('\n'.join(comments))
===================================== gajim/gtk/exception.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.helpers import get_gobject_version from gajim.common.helpers import get_os_name from gajim.common.helpers import get_os_version +from gajim.common.helpers import get_soup_version from gajim.common.i18n import _ from gajim.common.util.http import create_http_request
@@ -63,6 +64,7 @@ - GTK Version: {} - PyGObject Version: {} - GLib Version : {} +- libsoup Version: {} - python-nbxmpp Version: {} - Gajim Version: {}
@@ -161,6 +163,7 @@ def _get_issue_text(traceback_text: str) -> str: get_gtk_version(), get_gobject_version(), get_glib_version(), + get_soup_version(), nbxmpp.__version__, gajim.__version__, traceback_text)
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f2d22f6ed5082055c2eab913df0a0162...