Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
e1d063f2
by Philipp Hörist at 2023-05-20T20:13:13+02:00
-
cf0c1981
by Philipp Hörist at 2023-05-20T20:13:13+02:00
-
c0c723e1
by Philipp Hörist at 2023-05-20T20:13:13+02:00
4 changed files:
Changes:
| ... | ... | @@ -68,6 +68,7 @@ |
| 68 | 68 | from gi.repository import Gio
|
| 69 | 69 | from gi.repository import GLib
|
| 70 | 70 | from gi.repository import GObject
|
| 71 | +from gi.repository import Soup
|
|
| 71 | 72 | from nbxmpp.const import Affiliation
|
| 72 | 73 | from nbxmpp.const import Chatstate
|
| 73 | 74 | from nbxmpp.const import ConnectionProtocol
|
| ... | ... | @@ -1552,6 +1553,12 @@ def get_glib_version() -> str: |
| 1552 | 1553 | GLib.MICRO_VERSION]))
|
| 1553 | 1554 | |
| 1554 | 1555 | |
| 1556 | +def get_soup_version() -> str:
|
|
| 1557 | + return '.'.join(map(str, [Soup.get_major_version(),
|
|
| 1558 | + Soup.get_minor_version(),
|
|
| 1559 | + Soup.get_micro_version()]))
|
|
| 1560 | + |
|
| 1561 | + |
|
| 1555 | 1562 | def package_version(requirement: str) -> bool:
|
| 1556 | 1563 | req = Requirement(requirement)
|
| 1557 | 1564 |
| ... | ... | @@ -37,7 +37,6 @@ |
| 37 | 37 | from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord
|
| 38 | 38 | from omemo_dr.state.store import Store
|
| 39 | 39 | from omemo_dr.structs import IdentityInfo
|
| 40 | -from omemo_dr.util.medium import Medium
|
|
| 41 | 40 | |
| 42 | 41 | from gajim.common import app
|
| 43 | 42 | from gajim.common.modules.util import LogAdapter
|
| ... | ... | @@ -395,10 +394,6 @@ def remove_signed_pre_key(self, signed_pre_key_id: int) -> None: |
| 395 | 394 | self._con.execute(query, (signed_pre_key_id,))
|
| 396 | 395 | self._con.commit()
|
| 397 | 396 | |
| 398 | - def get_next_signed_pre_key_id(self) -> int:
|
|
| 399 | - result = self.get_current_signed_pre_key_id()
|
|
| 400 | - return (result % (Medium.MAX_VALUE - 1)) + 1
|
|
| 401 | - |
|
| 402 | 397 | def get_current_signed_pre_key_id(self) -> int:
|
| 403 | 398 | query = 'SELECT MAX(prekey_id) FROM signed_prekeys'
|
| 404 | 399 | result = self._con.execute(query).fetchone()
|
| ... | ... | @@ -15,20 +15,22 @@ |
| 15 | 15 | import cairo
|
| 16 | 16 | import nbxmpp
|
| 17 | 17 | from gi.repository import Gdk
|
| 18 | -from gi.repository import GLib
|
|
| 19 | -from gi.repository import GObject
|
|
| 20 | 18 | from gi.repository import Gtk
|
| 21 | 19 | from gi.repository import Pango
|
| 22 | -from gi.repository import Soup
|
|
| 23 | 20 | |
| 24 | 21 | from gajim.common import app
|
| 25 | 22 | from gajim.common.const import ARTISTS
|
| 26 | 23 | from gajim.common.const import DEVS_CURRENT
|
| 27 | 24 | from gajim.common.const import DEVS_PAST
|
| 28 | 25 | from gajim.common.const import THANKS
|
| 26 | +from gajim.common.helpers import get_glib_version
|
|
| 27 | +from gajim.common.helpers import get_gobject_version
|
|
| 28 | +from gajim.common.helpers import get_soup_version
|
|
| 29 | 29 | from gajim.common.helpers import open_uri
|
| 30 | 30 | from gajim.common.i18n import _
|
| 31 | 31 | |
| 32 | +from gajim.gtk.util import get_gtk_version
|
|
| 33 | + |
|
| 32 | 34 | |
| 33 | 35 | class AboutDialog(Gtk.AboutDialog):
|
| 34 | 36 | def __init__(self):
|
| ... | ... | @@ -40,32 +42,20 @@ def __init__(self): |
| 40 | 42 | self.set_license_type(Gtk.License.GPL_3_0_ONLY)
|
| 41 | 43 | self.set_website('https://gajim.org/')
|
| 42 | 44 | |
| 43 | - gtk_ver = '%i.%i.%i' % (
|
|
| 44 | - Gtk.get_major_version(),
|
|
| 45 | - Gtk.get_minor_version(),
|
|
| 46 | - Gtk.get_micro_version())
|
|
| 47 | - gobject_ver = '.'.join(map(str, GObject.pygobject_version))
|
|
| 48 | - glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION,
|
|
| 49 | - GLib.MINOR_VERSION,
|
|
| 50 | - GLib.MICRO_VERSION]))
|
|
| 51 | 45 | cairo_ver = cairo.cairo_version_string()
|
| 52 | 46 | python_cairo_ver = cairo.version
|
| 53 | 47 | |
| 54 | - soup_ver = '.'.join(map(str, [Soup.get_major_version(),
|
|
| 55 | - Soup.get_minor_version(),
|
|
| 56 | - Soup.get_micro_version()]))
|
|
| 57 | - |
|
| 58 | 48 | comments: list[str] = []
|
| 59 | 49 | comments.append(_('A fully-featured XMPP chat client'))
|
| 60 | 50 | comments.append('')
|
| 61 | - comments.append(_('GTK Version: %s') % gtk_ver)
|
|
| 62 | - comments.append(_('GLib Version: %s') % glib_ver)
|
|
| 51 | + comments.append(_('GTK Version: %s') % get_gtk_version())
|
|
| 52 | + comments.append(_('GLib Version: %s') % get_glib_version())
|
|
| 63 | 53 | comments.append(_('Pango Version: %s') % Pango.version_string())
|
| 64 | - comments.append(_('PyGObject Version: %s') % gobject_ver)
|
|
| 54 | + comments.append(_('PyGObject Version: %s') % get_gobject_version())
|
|
| 65 | 55 | comments.append(_('cairo Version: %s') % cairo_ver)
|
| 66 | 56 | comments.append(_('pycairo Version: %s') % python_cairo_ver)
|
| 67 | 57 | comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__)
|
| 68 | - comments.append(_('libsoup Version: %s') % soup_ver)
|
|
| 58 | + comments.append(_('libsoup Version: %s') % get_soup_version())
|
|
| 69 | 59 | |
| 70 | 60 | self.set_comments('\n'.join(comments))
|
| 71 | 61 |
| ... | ... | @@ -43,6 +43,7 @@ |
| 43 | 43 | from gajim.common.helpers import get_gobject_version
|
| 44 | 44 | from gajim.common.helpers import get_os_name
|
| 45 | 45 | from gajim.common.helpers import get_os_version
|
| 46 | +from gajim.common.helpers import get_soup_version
|
|
| 46 | 47 | from gajim.common.i18n import _
|
| 47 | 48 | from gajim.common.util.http import create_http_request
|
| 48 | 49 | |
| ... | ... | @@ -63,6 +64,7 @@ |
| 63 | 64 | - GTK Version: {}
|
| 64 | 65 | - PyGObject Version: {}
|
| 65 | 66 | - GLib Version : {}
|
| 67 | +- libsoup Version: {}
|
|
| 66 | 68 | - python-nbxmpp Version: {}
|
| 67 | 69 | - Gajim Version: {}
|
| 68 | 70 | |
| ... | ... | @@ -161,6 +163,7 @@ def _get_issue_text(traceback_text: str) -> str: |
| 161 | 163 | get_gtk_version(),
|
| 162 | 164 | get_gobject_version(),
|
| 163 | 165 | get_glib_version(),
|
| 166 | + get_soup_version(),
|
|
| 164 | 167 | nbxmpp.__version__,
|
| 165 | 168 | gajim.__version__,
|
| 166 | 169 | traceback_text)
|