Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim] Deleted branch dataform-scrolled-width
by Daniel Brötzmann (＠wurstsalat) 03 Dec '22

03 Dec '22

Daniel Brötzmann deleted branch dataform-scrolled-width at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: DataFormWidget: Set min width on right box
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12b0a427 by wurstsalat at 2022-12-03T09:05:20+00:00 imprv: DataFormWidget: Set min width on right box Fixes #11222 - - - - - 2 changed files: - gajim/gtk/dataform.py - gajim/gtk/groupchat_config.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -254,6 +254,7 @@ def __init__(self, options: dict[str, Any]) -> None: left_width = options.get('left-width', 100) self._left_box.set_size_request(left_width, -1) self._right_box.set_hexpand(True) + self._right_box.set_size_request(250, -1) def add(self, form_grid: FormGrid, row_number: int) -> None: form_grid.attach(self._left_box, 0, row_number, 1, 1) ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -72,6 +72,7 @@ def __init__(self, client: Client, contact: GroupchatContact) -> None: def _set_form(self, form: Any) -> None: self._data_form_widget = DataFormWidget(form) self._data_form_widget.connect('is-valid', self._on_is_valid) + self._data_form_widget.get_style_context().add_class('padding-12') self._data_form_widget.show_all() self._ui.config_box.add(self._data_form_widget) self._ui.stack.set_visible_child_name('config') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12b0a42759ccc86deb32c782a770a696… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12b0a42759ccc86deb32c782a770a696… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][dataform-scrolled-width] 62 commits: imprv: Accounts window: Use equal widths for account switch label
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch dataform-scrolled-width at gajim / gajim Commits: d08913b5 by wurstsalat at 2022-11-06T14:02:25+01:00 imprv: Accounts window: Use equal widths for account switch label - - - - - e7736e63 by Nicoco at 2022-11-06T13:20:29+00:00 imprv: Chatstates: Add a timeout for the "composing" animation - - - - - b5398fd0 by Philipp Hörist at 2022-11-06T23:44:22+01:00 refactor: Control: Simplify request history callback - - - - - 0a5e2a79 by wurstsalat at 2022-11-07T16:38:59+01:00 cq: CSS: Simplify some rules - - - - - 2d6e4b5a by wurstsalat at 2022-11-08T14:27:57+01:00 imprv: Preferences: Improve preview settings - - - - - 35b754f6 by wurstsalat at 2022-11-08T16:02:10+01:00 cfix: Preferences: Revert preview file size units - - - - - 8e5bb40c by wurstsalat at 2022-11-09T20:32:44+01:00 fix: Preview: Stop further processing if decompression bomb detected Fixes #11280 - - - - - dfa950f3 by Philipp Hörist at 2022-11-11T19:07:12+01:00 perf: Control: Request history more efficiently - Limit how many events are requested - Merge events and messages and add them afterwards - - - - - 40770fa7 by wurstsalat at 2022-11-13T14:17:10+01:00 cq: Update pyright config - - - - - c549fff0 by wurstsalat at 2022-11-15T12:00:59+01:00 imprv: ChatList: Scroll to top when switching workspace - - - - - 096e6d69 by Daniel Brötzmann at 2022-11-15T12:15:17+00:00 chore: DOAP: Add XEP-0402 - - - - - 69553e56 by wurstsalat at 2022-11-16T12:32:53+01:00 fix: ConversationView: Fix scrollbar not being the right-most widget This makes it possible to easily 'find' the scrollbar while having Gajim in fullscreen mode. - - - - - 2cf08d52 by wurstsalat at 2022-11-16T12:44:11+01:00 cfix: SearchView: Add separate class for search view rows - - - - - 7b3971b6 by wurstsalat at 2022-11-16T16:50:52+01:00 fix: Preview: Respect MUC context for PMs Fixes #11289 - - - - - 7ccf4806 by wurstsalat at 2022-11-17T17:38:46+01:00 fix: MessageActionsBox: Reintroduce gui_extension_point This is necessary when activating plugins after launch - - - - - d7121d8e by wurstsalat at 2022-11-18T14:07:32+01:00 fix: GroupchatRoster: Set visibility when hiding Hides the roster completely, so that the chat scrollbar is the right-most widget. Caveat: Un-reveal animation is gone - - - - - 23f90923 by wurstsalat at 2022-11-24T16:57:55+01:00 other: Remove obsolete htmltextview test - - - - - a3d7d6a3 by mjk at 2022-11-24T19:43:00+00:00 imprv: Prettify display of geographical locations - - - - - 42adccad by wurstsalat at 2022-11-24T20:54:40+01:00 refactor: MoreMenuButton: Use Gio.Menu Fixes #11262 - - - - - 01fd1b72 by wurstsalat at 2022-11-24T22:08:22+01:00 fix: Chatstates: Switch to Chatstate.ACTIVE after timeout - - - - - a6037e25 by wurstsalat at 2022-11-24T22:23:04+00:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 53d01bd6 by wurstsalat at 2022-11-24T23:33:00+01:00 refactor: Remove obsolete FileTransferSend dialog - - - - - 45033e89 by wurstsalat at 2022-11-25T15:14:42+01:00 refactor: Preview: Use Gio.Menu and Actions - - - - - 66d9ad4d by wurstsalat at 2022-11-25T15:25:54+01:00 cfix: Preferences: Use correct preview actions - - - - - 26f68c7f by wurstsalat at 2022-11-25T15:26:17+01:00 cfix: Menus: Fix linting error - - - - - b02f54d3 by wurstsalat at 2022-11-25T15:26:40+01:00 cq: File Choosers: Fix typo - - - - - 027b2d47 by wurstsalat at 2022-11-25T15:27:57+01:00 cfix: FileTransferSelector: Improve file choosing - - - - - 88daed91 by wurstsalat at 2022-11-25T16:24:19+01:00 cq: Contacts: Add more log output - - - - - b8c09a65 by wurstsalat at 2022-11-25T17:38:12+01:00 fix: SearchView: Set chat type correctly for ResultRows Fixes #11087 - - - - - 8e0f472a by wurstsalat at 2022-11-25T18:30:44+01:00 fix: ChatFunctionPage: Don't close control on cancelling join error Fixes #11116 - - - - - 44eab3c1 by wurstsalat at 2022-11-25T19:00:31+01:00 refactor: AvatarStorage: Access some methods directly - - - - - be7f2621 by wurstsalat at 2022-11-25T21:03:37+01:00 cq: Settings: Improve type annotations - - - - - 3c312d13 by wurstsalat at 2022-11-26T12:09:58+00:00 change: Jingle: Remove XTLS support XTLS has never been standardized, see https://datatracker.ietf.org/doc/html/draft-meyer-xmpp-e2e-encryption Gajim used this for file transfers, but there probably was no other client supporting this now obsolete feature. Today, using XEP-0396: Jingle Encrypted Transports - OMEMO would be the preferred solution. Part of #11160 - - - - - 8aafb212 by wurstsalat at 2022-11-27T14:45:22+01:00 fix: SSLErrorDialog: Fix test, remove OpenSSL usage - - - - - df1b8a56 by wurstsalat at 2022-11-27T14:57:16+01:00 chore: Update pyright config - - - - - 1c327c75 by wurstsalat at 2022-11-27T15:02:17+01:00 cfix: Menus: Add ellipsis to Save as… preview menu item - - - - - bd8b229b by wurstsalat at 2022-11-27T16:45:56+01:00 fix: GUI tests: Adapt GUI tests to Gajim changes - - - - - 8da84be4 by wurstsalat at 2022-11-27T19:35:20+00:00 refactor: CertificateBox: Use cryptography module for certificate details - - - - - b2957213 by wurstsalat at 2022-11-27T19:35:20+00:00 change: Dependencies: Remove pyOpenSSL, add python-cryptography - - - - - bf75d672 by Philipp Hörist at 2022-11-27T23:43:04+01:00 ci: Add ruff configuration - - - - - fde324b2 by Philipp Hörist at 2022-11-27T23:50:02+01:00 ci: Debian: Add cryptography to build dependencies - - - - - d0032cd9 by wurstsalat at 2022-11-27T23:36:19+00:00 imprv: Settings: Unify timestamp settings Part of #10948 - - - - - 020230b5 by wurstsalat at 2022-11-28T10:29:41+01:00 imprv: Message selection: Use date_time_format instead of time_format - - - - - 4b6f68da by wurstsalat at 2022-11-28T18:10:11+01:00 chore: Update builder.pyi - - - - - d4c21af6 by wurstsalat at 2022-11-28T18:48:06+01:00 cq: AccountWizard: Improve type annotations - - - - - 806d4757 by wurstsalat at 2022-11-29T13:18:01+01:00 fix: MessageInputTextView: Reintroduce gui_extension_point This is necessary when activating plugins after launch - - - - - 2f8986b3 by wurstsalat at 2022-11-30T00:22:34+01:00 cq: Remove unnecessary pyright ignore comments - - - - - b84ef377 by mjk at 2022-11-30T21:05:07+00:00 imprv: Styling: Introduce URI scheme whitelisting Fixes #11266 Co-authored-by: Philipp Hörist <philipp(a)hoerist.com> - - - - - ec0008b7 by mjk at 2022-11-30T21:17:13+00:00 fix: Styling: Linkify URIs only if at the start of a word - - - - - 88989297 by mjk at 2022-11-30T21:19:03+00:00 refactor: Tests: Improve failure reports in test_styling - - - - - eebbe3e8 by wurstsalat at 2022-11-30T21:34:12+00:00 refactor: Remove old emoji code Fixes #10932 - - - - - d0fb8c5b by mjk at 2022-11-30T21:58:07+00:00 fix: Preview: Handle multiple simultaneous certificate verification errors - - - - - 58c59ec5 by Philipp Hörist at 2022-11-30T23:38:26+01:00 refactor: Move GstPbutils import into method app.detect_dependencies() needs to call gi.require() first, so import this inside the method - - - - - d3953b58 by Philipp Hörist at 2022-11-30T23:59:57+01:00 imprv: Features: Add entry for Audio Preview - - - - - 4ad531df by Philipp Hörist at 2022-12-01T00:14:02+01:00 refactor: Remove debian related package names - - - - - 8011ff31 by wurstsalat at 2022-12-01T21:31:30+01:00 imprv: Message selection: Improve styling - - - - - ace22758 by wurstsalat at 2022-12-01T22:46:29+01:00 imprv: Message selection: Imrpove wording for deselecting messages - - - - - 977a6f77 by wurstsalat at 2022-12-03T00:31:38+01:00 imprv: MUC: Add method for aborting join - - - - - a77decef by Philipp Hörist at 2022-12-03T09:42:30+01:00 cfix: AccountWizard: Don’t translate URL labels - - - - - 5c3c60fc by Weblate at 2022-12-03T09:55:58+01:00 chore: Update translations - - - - - d724c016 by Philipp Hörist at 2022-12-03T10:01:10+01:00 chore: Cleanup stale translations - - - - - 12b0a427 by wurstsalat at 2022-12-03T09:05:20+00:00 imprv: DataFormWidget: Set min width on right box Fixes #11222 - - - - - 30 changed files: - .gitlab/issue_templates/Release.md - README.md - data/gajim.doap - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/helpers.py - + gajim/common/iana.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - − gajim/common/jingle_xtls.py - gajim/common/modules/bytestream.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/modules/muc.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/socks5.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05770065810c7c8d7072e04af8c25d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05770065810c7c8d7072e04af8c25d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Update translations
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c3c60fc by Weblate at 2022-12-03T09:55:58+01:00 chore: Update translations - - - - - d724c016 by Philipp Hörist at 2022-12-03T10:01:10+01:00 chore: Cleanup stale translations - - - - - 5 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a77decefa68fd3ab5bba7efaa4eca71… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a77decefa68fd3ab5bba7efaa4eca71… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: AccountWizard: Don’t translate URL labels
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a77decef by Philipp Hörist at 2022-12-03T09:42:30+01:00 cfix: AccountWizard: Don’t translate URL labels - - - - - 1 changed file: - gajim/data/gui/account_wizard.ui Changes: ===================================== gajim/data/gui/account_wizard.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkBox" id="account_label_box"> @@ -659,7 +659,7 @@ Creating an account on one server allows you to communicate with contacts from o <object class="GtkLabel" id="recommendation_link1"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes"><a href='https://xmpp.org/getting-started/'>xmpp.org/getting-started</a></property> + <property name="label"><a href='https://xmpp.org/getting-started/'>xmpp.org/getting-started</a></property> <property name="use-markup">True</property> <property name="wrap">True</property> <property name="wrap-mode">word-char</property> @@ -695,7 +695,7 @@ Creating an account on one server allows you to communicate with contacts from o <object class="GtkLabel" id="recommendation_link2"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes"><a href='https://conversations.im/compliance/'>conversations.im/compliance</a></property> + <property name="label"><a href='https://conversations.im/compliance/'>conversations.im/compliance</a></property> <property name="use-markup">True</property> <property name="wrap">True</property> <property name="wrap-mode">word-char</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a77decefa68fd3ab5bba7efaa4eca71e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a77decefa68fd3ab5bba7efaa4eca71e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MUC: Add method for aborting join
by Philipp Hörist (＠lovetox) 03 Dec '22

03 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 977a6f77 by wurstsalat at 2022-12-03T00:31:38+01:00 imprv: MUC: Add method for aborting join - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -374,6 +374,17 @@ def leave(self, room.set_not_joined() room.notify('room-left') + def abort_join(self, room_jid: str) -> None: + self._remove_rejoin_timeout(room_jid) + + muc = self._mucs[room_jid] + self._con.get_module('Presence').send_presence( + muc.occupant_jid, + typ='unavailable', + caps=False) + + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + def configure_room(self, room_jid: str) -> None: self._nbxmpp('MUC').request_config(room_jid, callback=self._on_room_config) ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from gi.repository import GLib from gi.repository import Gtk from gajim.common import app @@ -103,7 +102,5 @@ def _on_join_clicked(self, _button: Gtk.Button) -> None: def _on_abort_clicked(self, _button: Gtk.Button) -> None: assert self._contact is not None - app.window.activate_action( - 'remove-chat', - GLib.Variant( - 'as', [self._contact.account, str(self._contact.jid)])) + client = app.get_client(self._contact.account) + client.get_module('MUC').abort_join(self._contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/977a6f7795648cdc831793e7a0b406e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/977a6f7795648cdc831793e7a0b406e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Message selection: Imrpove wording for deselecting messages
by Daniel Brötzmann (＠wurstsalat) 01 Dec '22

01 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ace22758 by wurstsalat at 2022-12-01T22:46:29+01:00 imprv: Message selection: Imrpove wording for deselecting messages - - - - - 1 changed file: - gajim/gtk/conversation/message_selection.py Changes: ===================================== gajim/gtk/conversation/message_selection.py ===================================== @@ -35,7 +35,8 @@ def __init__(self) -> None: self.get_style_context().add_class('floating-overlay-box') - label = Gtk.Label(label=_('Click messages to select them')) + label = Gtk.Label(label=_('Click messages to select them\n' + '(Ctrl + Double Click to deselect)')) self.attach(label, 0, 0, 2, 1) copy_button = Gtk.Button(label=_('Copy Text')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ace22758fc34357d0e29adabccaa15e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ace22758fc34357d0e29adabccaa15e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Message selection: Improve styling
by Daniel Brötzmann (＠wurstsalat) 01 Dec '22

01 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8011ff31 by wurstsalat at 2022-12-01T21:31:30+01:00 imprv: Message selection: Improve styling - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -210,13 +210,13 @@ .badge { .link-button { min-height: 0px; } .floating-overlay-box { - background-color: alpha(shade(@theme_bg_color, 0.3), 0.9); + background-color: alpha(shade(@theme_bg_color, 0.3), 0.8); padding: 12px; border-radius: 6px; } .floating-overlay-box > label, .floating-overlay-box > spinner { - color: @theme_bg_color; + color: shade(@theme_bg_color, 4.0); } /* Main Window ============================================================= */ @@ -533,6 +533,10 @@ .conversation-row { .conversation-row:hover button { opacity: 1; } +.conversation-row:selected * { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} .conversation-row grid textview:not(.sourceview), .conversation-row grid textview:not(.sourceview) text { background: transparent; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8011ff31f92e002d78e1c152ba082b0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8011ff31f92e002d78e1c152ba082b0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Move GstPbutils import into method
by Philipp Hörist (＠lovetox) 30 Nov '22

30 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58c59ec5 by Philipp Hörist at 2022-11-30T23:38:26+01:00 refactor: Move GstPbutils import into method app.detect_dependencies() needs to call gi.require() first, so import this inside the method - - - - - d3953b58 by Philipp Hörist at 2022-11-30T23:59:57+01:00 imprv: Features: Add entry for Audio Preview - - - - - 4ad531df by Philipp Hörist at 2022-12-01T00:14:02+01:00 refactor: Remove debian related package names - - - - - 2 changed files: - gajim/common/preview_helpers.py - gajim/gtk/features.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -32,11 +32,6 @@ from gi.repository import GLib from gi.repository import Gio -try: - from gi.repository import GstPbutils -except Exception: - pass - from PIL import Image from PIL import ImageFile @@ -421,6 +416,9 @@ def aes_decrypt(key: bytes, iv: bytes, payload: bytes) -> bytes: def contains_audio_streams(file_path: Path) -> bool: # Check if it is really an audio file + + from gi.repository import GstPbutils + has_audio = False discoverer = GstPbutils.Discoverer() try: ===================================== gajim/gtk/features.py ===================================== @@ -107,12 +107,18 @@ def _get_features(self) -> list[Feature]: _('Requires: libappindicator3'), _('No additional requirements'), None), - Feature(_('Audio / Video'), + Feature(_('Audio Preview'), + app.is_installed('GST'), + _('Enables Gajim to provide a Audio preview'), + _('Requires: gstreamer-1.0, gst-plugins-base-1.0'), + _('No additional requirements'), + None), + Feature(_('Audio / Video Calls'), av_available, _('Enables Gajim to provide Audio and Video chats'), - _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' - 'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, ' - 'gstreamer1.0-libav, and gstreamer1.0-gtk3'), + _('Requires: farstream-0.2, gstreamer-1.0, ' + 'gst-plugins-base-1.0, gst-plugins-ugly-1.0, ' + 'gst-libav and gstreamer-gtk3-plugin'), _('Feature not available on Windows'), None), Feature(_('Automatic Status'), @@ -146,7 +152,7 @@ def _get_features(self) -> list[Feature]: app.is_installed('UPNP'), _('Enables Gajim to request your router to forward ports ' 'for file transfers'), - _('Requires: gir1.2-gupnpigd-1.0'), + _('Requires: gupnpigd-1.0'), _('Feature not available on Windows'), None) ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d0fb8c5b47620d3d2831ecb529ef422… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d0fb8c5b47620d3d2831ecb529ef422… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Handle multiple simultaneous certificate verification errors
by Philipp Hörist (＠lovetox) 30 Nov '22

30 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0fb8c5b by mjk at 2022-11-30T21:58:07+00:00 fix: Preview: Handle multiple simultaneous certificate verification errors - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/preview.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1277,11 +1277,9 @@ def is_retraction_allowed(self_contact: types.GroupchatParticipant, return self_contact.affiliation >= contact.affiliation -def get_tls_error_phrase(tls_error: Gio.TlsCertificateFlags) -> str: - phrase = GIO_TLS_ERRORS.get(tls_error) - if phrase is None: - return GIO_TLS_ERRORS[Gio.TlsCertificateFlags.GENERIC_ERROR] - return phrase +def get_tls_error_phrases(tls_errors: set[Gio.TlsCertificateFlags] + ) -> list[str]: + return [GIO_TLS_ERRORS[err] for err in tls_errors] class Observable: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -46,7 +46,7 @@ from gajim.common.events import HTTPUploadError from gajim.common.events import HTTPUploadStarted from gajim.common.i18n import _ -from gajim.common.helpers import get_tls_error_phrase +from gajim.common.helpers import get_tls_error_phrases from gajim.common.helpers import get_account_proxy from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer @@ -318,16 +318,14 @@ def _check_certificate(self, self._session.cancel_message(message, Soup.Status.CANCELLED) return - tls_errors = convert_tls_error_flags(tls_errors) - if app.cert_store.verify(tls_certificate, tls_errors): + tls_error_set = convert_tls_error_flags(tls_errors) + if app.cert_store.verify(tls_certificate, tls_error_set): return - phrase = '' - for error in tls_errors: - phrase = get_tls_error_phrase(error) - self._log.warning('TLS verification failed: %s', phrase) - - transfer.set_error('tls-verification-failed', phrase) + phrases = get_tls_error_phrases(tls_error_set) + self._log.warning( + 'TLS verification failed: %s (0x%02x)', phrases, tls_errors) + transfer.set_error('tls-verification-failed', phrases[0]) self._session.cancel_message(message, Soup.Status.CANCELLED) def _on_finish(self, ===================================== gajim/common/preview.py ===================================== @@ -25,6 +25,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Soup +from nbxmpp.util import convert_tls_error_flags from gajim.common import app from gajim.common import configpaths @@ -32,7 +33,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import load_file_async from gajim.common.helpers import write_file_async -from gajim.common.helpers import get_tls_error_phrase +from gajim.common.helpers import get_tls_error_phrases from gajim.common.helpers import get_account_proxy from gajim.common.i18n import _ from gajim.common.preview_helpers import aes_decrypt @@ -442,11 +443,12 @@ def _check_certificate(self, return if tls_errors: - phrase = get_tls_error_phrase(tls_errors) - log.warning('TLS verification failed: %s', phrase) + phrases = get_tls_error_phrases(convert_tls_error_flags(tls_errors)) + log.warning( + 'TLS verification failed: %s (0x%02x)', phrases, tls_errors) session = self._get_session(preview.account) session.cancel_message(message, Soup.Status.CANCELLED) - preview.info_message = _('TLS verification failed: %s') % phrase + preview.info_message = _('TLS verification failed: %s') % phrases[0] preview.update_widget() def _on_content_sniffed(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0fb8c5b47620d3d2831ecb529ef4225… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0fb8c5b47620d3d2831ecb529ef4225… 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