Commits April 2023

commits@gajim.org

1 participants
108 discussions

[Git][gajim/gajim][master] cfix: ContactInfo: Regenerate typing stubs
by Daniel Brötzmann (＠wurstsalat) 29 Apr '23

29 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 128be76c by wurstsalat at 2023-04-29T17:23:01+02:00 cfix: ContactInfo: Regenerate typing stubs - - - - - 1 changed file: - gajim/gtk/builder.pyi Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -286,6 +286,7 @@ class ContactInfoBuilder(Builder): encryption_box: Gtk.Box groups_page_stack: Gtk.Stack groups_treeview: Gtk.TreeView + tree_selection: Gtk.TreeSelection toggle_renderer: Gtk.CellRendererToggle text_renderer: Gtk.CellRendererText group_add_button: Gtk.ToolButton View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/128be76c7714afdac4bf0e7ed59175a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/128be76c7714afdac4bf0e7ed59175a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ContactInfo: Improve behavior for connection changes
by Daniel Brötzmann (＠wurstsalat) 29 Apr '23

29 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9574d19b by wurstsalat at 2023-04-29T16:48:55+02:00 fix: ContactInfo: Improve behavior for connection changes - - - - - 3 changed files: - gajim/data/gui/contact_info.ui - gajim/gtk/builder.pyi - gajim/gtk/contact_info.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -303,8 +303,8 @@ <object class="GtkLabel" id="contact_name_label"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="selectable">True</property> <property name="halign">center</property> + <property name="selectable">True</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> <property name="max-width-chars">20</property> @@ -760,134 +760,146 @@ </packing> </child> <child> - <object class="GtkBox" id="groups_page_box"> + <object class="GtkStack" id="groups_page_stack"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> - <property name="margin-top">24</property> - <property name="margin-bottom">36</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Choose the contact's groups</property> - <property name="wrap">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="transition-type">crossfade</property> <child> <object class="GtkBox"> - <property name="width-request">400</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> + <property name="no-show-all">True</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> + <property name="margin-top">24</property> + <property name="margin-bottom">36</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow"> - <property name="height-request">250</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Choose the contact's groups</property> + <property name="wrap">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="width-request">400</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> <child> - <object class="GtkViewport"> + <object class="GtkScrolledWindow"> + <property name="height-request">250</property> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkTreeView" id="groups_treeview"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="model">groups_model</property> - <property name="headers-visible">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="tree_selection"/> - </child> + <property name="can-focus">False</property> <child> - <object class="GtkTreeViewColumn"> + <object class="GtkTreeView" id="groups_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="model">groups_model</property> + <property name="headers-visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="tree_selection"/> + </child> <child> - <object class="GtkCellRendererToggle" id="toggle_renderer"> - <property name="xpad">12</property> + <object class="GtkTreeViewColumn"> + <child> + <object class="GtkCellRendererToggle" id="toggle_renderer"> + <property name="xpad">12</property> + </object> + <attributes> + <attribute name="active">0</attribute> + </attributes> + </child> </object> - <attributes> - <attribute name="active">0</attribute> - </attributes> </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">column</property> - <property name="sort-column-id">1</property> <child> - <object class="GtkCellRendererText" id="text_renderer"> - <property name="height">42</property> - <property name="editable">True</property> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">column</property> + <property name="sort-column-id">1</property> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="height">42</property> + <property name="editable">True</property> + </object> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> </object> - <attributes> - <attribute name="text">1</attribute> - </attributes> </child> </object> </child> </object> </child> </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkToolbar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton" id="group_add_button"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Add Group…</property> - <property name="use-underline">True</property> - <property name="icon-name">list-add-symbolic</property> - <signal name="clicked" handler="_on_group_add_button_clicked" swapped="no"/> - </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkToolButton" id="group_remove_button"> + <object class="GtkToolbar"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Remove Group...</property> - <property name="use-underline">True</property> - <property name="icon-name">list-remove-symbolic</property> - <signal name="clicked" handler="_on_group_remove_button_clicked" swapped="no"/> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="group_add_button"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Add Group…</property> + <property name="use-underline">True</property> + <property name="icon-name">list-add-symbolic</property> + <signal name="clicked" handler="_on_group_add_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="group_remove_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Remove Group...</property> + <property name="use-underline">True</property> + <property name="icon-name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_group_remove_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> - <style> - <class name="inline-toolbar"/> - </style> </object> <packing> <property name="expand">False</property> @@ -897,9 +909,21 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="name">groups</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are offline.</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="name">offline</property> + <property name="position">1</property> </packing> </child> </object> @@ -911,56 +935,80 @@ </packing> </child> <child> - <object class="GtkBox" id="notes_page_box"> + <object class="GtkStack" id="notes_page_stack"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="margin-start">18</property> - <property name="margin-end">18</property> - <property name="margin-top">24</property> - <property name="margin-bottom">36</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="transition-type">crossfade</property> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Personal notes about this contact</property> - <property name="wrap">True</property> - <property name="max-width-chars">42</property> - <style> - <class name="dim-label"/> - </style> + <property name="no-show-all">True</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> + <property name="margin-top">24</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Personal notes about this contact</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_annotation"> + <property name="height-request">70</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTextView" id="textview_annotation"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="wrap-mode">word</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="name">notes</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_annotation"> - <property name="height-request">70</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkTextView" id="textview_annotation"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> - </object> - </child> + <property name="can-focus">False</property> + <property name="label" translatable="yes">You are offline.</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="name">offline</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -284,14 +284,13 @@ class ContactInfoBuilder(Builder): remove_history_button: Gtk.Button encryption_scrolled: Gtk.ScrolledWindow encryption_box: Gtk.Box - groups_page_box: Gtk.Box + groups_page_stack: Gtk.Stack groups_treeview: Gtk.TreeView - tree_selection: Gtk.TreeSelection toggle_renderer: Gtk.CellRendererToggle text_renderer: Gtk.CellRendererText group_add_button: Gtk.ToolButton group_remove_button: Gtk.ToolButton - notes_page_box: Gtk.Box + notes_page_stack: Gtk.Stack scrolledwindow_annotation: Gtk.ScrolledWindow textview_annotation: Gtk.TextView devices_stack: Gtk.Stack ===================================== gajim/gtk/contact_info.py ===================================== @@ -157,6 +157,13 @@ def _on_client_state_changed(self, _('Not connected') if not state.is_connected else _('Edit Name…')) self._ui.subscription_listbox.set_sensitive(state.is_connected) + if state.is_connected: + self._ui.groups_page_stack.set_visible_child_name('groups') + self._ui.notes_page_stack.set_visible_child_name('notes') + else: + self._ui.groups_page_stack.set_visible_child_name('offline') + self._ui.notes_page_stack.set_visible_child_name('offline') + def _on_stack_child_changed(self, _widget: Gtk.Stack, _pspec: GObject.ParamSpec) -> None: @@ -168,7 +175,7 @@ def _on_destroy(self, _widget: ContactInfo) -> None: for task in self._tasks: task.cancel() - if self.contact.is_in_roster: + if self.contact.is_in_roster and self._client.state.is_available: self._save_annotation() for device_grid in self._devices.values(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9574d19b9103d078775f4733f0571ff8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9574d19b9103d078775f4733f0571ff8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: OMEMOTrustManager: Use date_time_format for last seen timestamp
by Daniel Brötzmann (＠wurstsalat) 29 Apr '23

29 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ca5f9660 by wurstsalat at 2023-04-29T13:19:36+02:00 fix: OMEMOTrustManager: Use date_time_format for last seen timestamp Fixes #11495 - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -323,7 +323,7 @@ def __init__(self, grid.attach(self.fingerprint, 2, 2, 1, 1) if last_seen is not None: - last_seen_str = time.strftime('%d-%m-%Y %H:%M:%S', + last_seen_str = time.strftime(app.settings.get('date_time_format'), time.localtime(last_seen)) else: last_seen_str = _('Never') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca5f966010befea3b7e14d42810317ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca5f966010befea3b7e14d42810317ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix access to GnuPG keys on flatpak
by André (＠andre) 29 Apr '23

29 Apr '23

André pushed to branch master at gajim / gajim Commits: a7734f87 by André Apitzsch at 2023-04-29T09:30:04+02:00 fix: Fix access to GnuPG keys on flatpak Fixes gajim/gajim-plugins#621. - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -30,6 +30,7 @@ finish-args: - --talk-name=org.kde.StatusNotifierWatcher # GnuPG - --filesystem=~/.gnupg + - --filesystem=xdg-run/gnupg # camera access - --device=all # extensions ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -23,6 +23,7 @@ finish-args: - --talk-name=org.kde.StatusNotifierWatcher # GnuPG - --filesystem=~/.gnupg + - --filesystem=xdg-run/gnupg # camera access - --device=all # extensions View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7734f87a9a552810d0b9f48b41d2c9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a7734f87a9a552810d0b9f48b41d2c9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix showing status icon on flatpak
by Philipp Hörist (＠lovetox) 28 Apr '23

28 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ebc1f377 by André Apitzsch at 2023-04-28T22:56:48+02:00 fix: Fix showing status icon on flatpak AppIndicator cannot access files within the flatpak container. - - - - - 1 changed file: - gajim/gtk/status_icon.py Changes: ===================================== gajim/gtk/status_icon.py ===================================== @@ -303,7 +303,8 @@ def __init__(self) -> None: 'Gajim', 'org.gajim.Gajim', AppIndicator.IndicatorCategory.COMMUNICATIONS) - self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) + if not app.is_flatpak(): + self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) self._status_icon.set_status(AppIndicator.IndicatorStatus.ACTIVE) self._status_icon.set_menu(self._ui.systray_context_menu) self._status_icon.set_secondary_activate_target( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ebc1f37768612cd23f3fef6598d7d085… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ebc1f37768612cd23f3fef6598d7d085… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: change: OMEMO verification: Generate URIs with pedantically correct query
by Philipp Hörist (＠lovetox) 28 Apr '23

28 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17a0b4df by mjk at 2023-04-28T16:06:38+00:00 change: OMEMO verification: Generate URIs with pedantically correct query RFC 5122 requires a querytype to be present. `message` is the least probable one to break receiving clients. - - - - - 04412912 by mjk at 2023-04-28T16:06:38+00:00 fix: Escape JIDs for xmpp URIs everywhere - - - - - 4 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/control.py - gajim/gtk/groupchat_info.py - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import types from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState +from gajim.common.const import XmppUriQuery from gajim.common.events import AccountEnabled from gajim.common.events import BookmarksReceived from gajim.common.events import MessageReceived @@ -37,7 +38,6 @@ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant -from gajim.common.util.text import jid_to_iri from gajim.gtk.builder import get_builder from gajim.gtk.groupchat_voice_requests_button import VoiceRequestsButton @@ -333,19 +333,22 @@ def _update_share_box(self) -> None: not self._contact.is_pm_contact) self._ui.jid_label.set_text(str(self._contact.jid)) - def _on_share_clicked(self, _button: Gtk.Button) -> None: - # Generate QR code on demand (i.e. not when switching chats) + def _get_share_uri(self) -> str: assert self._contact is not None - text = jid_to_iri(str(self._contact.jid)) + jid = self._contact.get_address() if self._contact.is_groupchat: - text = f'{text}?join' - self._ui.qr_code_image.set_from_pixbuf(generate_qr_code(text)) + return jid.to_iri(XmppUriQuery.JOIN.value) + else: + # TODO: add verified OMEMO FPs + return jid.to_iri() + + def _on_share_clicked(self, _button: Gtk.Button) -> None: + # Generate QR code on demand (i.e. not when switching chats) + self._ui.qr_code_image.set_from_pixbuf( + generate_qr_code(self._get_share_uri())) def _on_copy_jid_clicked(self, _button: Gtk.Button) -> None: - assert self._contact is not None - text = f'xmpp:{self._contact.jid}' - if self._contact.is_groupchat: - text = f'{text}?join' + text = self._get_share_uri() clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard.set_text(text, -1) self._ui.share_popover.popdown() ===================================== gajim/gtk/control.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import helpers from gajim.common import types from gajim.common.const import KindConstant +from gajim.common.const import XmppUriQuery from gajim.common.ged import EventHelper from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text @@ -1096,8 +1097,8 @@ def _process_muc_room_destroyed(self, message = _('Group chat has been destroyed%s') % reason if event.alternate is not None: - message += '\n' + _('You can join this group chat instead: ' - 'xmpp:%s?join') % str(event.alternate) + message += '\n' + _('You can join this group chat instead: %s') % ( + event.alternate.to_iri(XmppUriQuery.JOIN.value)) self.add_info_message(message, event.timestamp) ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -14,6 +14,7 @@ from typing import Optional +import logging import time from gi.repository import Gdk @@ -27,6 +28,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.const import RFC5646_LANGUAGE_TAGS +from gajim.common.const import XmppUriQuery from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -35,6 +37,8 @@ from gajim.gtk.builder import get_builder from gajim.gtk.util import make_href_markup +log = logging.getLogger('gajim.gtk.groupchat_info') + MUC_FEATURES = { 'muc_open': ( 'feather-globe-symbolic', @@ -200,7 +204,12 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: has_contacts = bool(info.muc_contacts) if has_contacts: for contact in info.muc_contacts: - self._ui.contact_box.add(self._get_contact_button(contact)) + try: + jid = JID.from_string(contact).new_as_bare() + except Exception as e: + log.debug('Bad MUC contact address %s: %s', contact, str(e)) + else: + self._ui.contact_box.add(self._get_contact_button(jid)) self._ui.contact_box.set_visible(has_contacts) self._ui.contact_label.set_visible(has_contacts) @@ -250,7 +259,7 @@ def _add_features(self, features: list[str]) -> None: def _on_copy_address(self, _button: Gtk.Button) -> None: clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - clipboard.set_text(f'xmpp:{self._info.jid}?join', -1) + clipboard.set_text(self._info.jid.to_iri(XmppUriQuery.JOIN.value), -1) @staticmethod def _on_activate_log_link(button: Gtk.LinkButton) -> int: @@ -258,7 +267,7 @@ def _on_activate_log_link(button: Gtk.LinkButton) -> int: return Gdk.EVENT_STOP def _on_activate_contact_link(self, button: Gtk.LinkButton) -> int: - open_uri(f'xmpp:{button.get_uri()}?message', account=self._account) + open_uri(button.get_uri(), account=self._account) return Gdk.EVENT_STOP @staticmethod @@ -283,8 +292,9 @@ def _get_feature_label(text: str) -> Gtk.Label: label.set_valign(Gtk.Align.START) return label - def _get_contact_button(self, contact: str) -> Gtk.Button: - button = Gtk.LinkButton(label=contact) + def _get_contact_button(self, contact: JID) -> Gtk.Button: + button = Gtk.LinkButton(contact.to_iri(XmppUriQuery.MESSAGE.value), + label=str(contact)) button.set_halign(Gtk.Align.START) button.get_style_context().add_class('link-button') button.connect('activate-link', self._on_activate_contact_link) ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -33,6 +33,7 @@ from gajim.common import app from gajim.common import ged from gajim.common import types +from gajim.common.const import XmppUriQuery from gajim.common.events import AccountConnected from gajim.common.events import AccountDisconnected from gajim.common.ged import EventHelper @@ -234,19 +235,20 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: self._ui.list.add(row) @staticmethod - def _get_qrcode(jid: str, + def _get_qrcode(jid: JID, sid: int, identity_key: IdentityKeyPair ) -> GdkPixbuf.Pixbuf | None: fingerprint = get_fingerprint(identity_key) - ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) + qry = (XmppUriQuery.MESSAGE.value, [(f'omemo-sid-{sid}', fingerprint)]) + ver_string = jid.new_as_bare().to_iri(qry) log.debug('Verification String: %s', ver_string) return generate_qr_code(ver_string) def _load_qrcode(self) -> None: client = app.get_client(self._account) - pixbuf = self._get_qrcode(client.get_own_jid().bare, + pixbuf = self._get_qrcode(client.get_own_jid(), self._omemo.backend.own_device, self._identity_key) self._ui.qr_code_image.set_from_pixbuf(pixbuf) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fdb3d18c7a64478b9e971bc19221df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9fdb3d18c7a64478b9e971bc19221df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: StartChat: Don't filter for account labels
by Daniel Brötzmann (＠wurstsalat) 28 Apr '23

28 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9fdb3d18 by Daniel Brötzmann at 2023-04-28T07:08:54+00:00 imprv: StartChat: Don't filter for account labels Fixes #11494 - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -863,8 +863,7 @@ def update_chat_type(self, groupchat: bool = False) -> None: def get_search_text(self) -> str: if self.contact is None and not self.groupchat: return str(self.jid) - if self.show_account: - return f'{self.name} {self.jid} {self.account_label}' + return f'{self.name} {self.jid}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fdb3d18c7a64478b9e971bc19221df2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9fdb3d18c7a64478b9e971bc19221df2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Ask for confirmation when leaving a MUC while offline
by Daniel Brötzmann (＠wurstsalat) 26 Apr '23

26 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ecf39613 by wurstsalat at 2023-04-26T19:35:27+02:00 fix: Ask for confirmation when leaving a MUC while offline Fixes #11487 - - - - - 1 changed file: - gajim/gtk/chat_list_stack.py Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -278,7 +278,8 @@ def _remove() -> None: client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid, groupchat=True) - if contact.is_not_joined: + if contact.is_not_joined and client.state.is_available: + # For example a chat opened from the search bar _remove() return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ecf39613291622fc0fc8568af71fc88f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ecf39613291622fc0fc8568af71fc88f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: OMEMOTrustManager: Fix dialog transient for removing keys
by Daniel Brötzmann (＠wurstsalat) 26 Apr '23

26 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2b075e32 by wurstsalat at 2023-04-26T19:22:53+02:00 fix: OMEMOTrustManager: Fix dialog transient for removing keys - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -342,8 +342,6 @@ def _on_destroy(self, *args: Any) -> None: app.check_finalize(self) def delete_fingerprint(self, *args: Any) -> None: - listbox = cast(Gtk.ListBox, self.get_parent()) - window = cast(Gtk.Window, listbox.get_window()) def _remove(): self._omemo.backend.remove_device(str(self.jid), self.device_id) @@ -352,6 +350,7 @@ def _remove(): self._omemo.backend.storage.deleteIdentity( str(self.jid), self._identity_key) + listbox = cast(Gtk.ListBox, self.get_parent()) listbox.remove(self) self.destroy() @@ -363,7 +362,7 @@ def _remove(): DialogButton.make('Remove', text=_('Delete'), callback=_remove)], - transient_for=window).show() + transient_for=cast(Gtk.Window, self.get_toplevel())).show() def set_trust(self) -> None: icon_name, tooltip, css_class = TRUST_DATA[self.trust] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b075e32e7d9e5508f43398090e52651… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b075e32e7d9e5508f43398090e52651… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: OMEMOTrustManager: Improve fingerprint listing header
by Daniel Brötzmann (＠wurstsalat) 26 Apr '23

26 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4a91ed1a by wurstsalat at 2023-04-26T09:23:19+02:00 cfix: OMEMOTrustManager: Improve fingerprint listing header - - - - - 1 changed file: - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -113,7 +113,7 @@ def _update(self) -> None: 'contact’s screen to ensure the safety of ' 'your end-to-end encrypted chat.') else: - header_text = _('Devices connected with %s') % self._contact.name + header_text = _('Devices connected with "%s"') % self._contact.name popover_qr_text = _('Compare this code with the one shown on your ' 'contact’s screen to ensure the safety of ' 'your end-to-end encrypted chat ' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a91ed1acb46668450882fc7cd9d274e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a91ed1acb46668450882fc7cd9d274e… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2023