Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][newcontrol] 2 commits: fix: Make Roster menu actions work again
by Philipp Hörist (＠lovetox) 03 Aug '22

03 Aug '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: f6b4791f by lovetox at 2022-08-03T21:58:45+02:00 fix: Make Roster menu actions work again - - - - - 3a57d37b by lovetox at 2022-08-03T22:01:27+02:00 cs: fix pyright error - - - - - 4 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/roster.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -208,7 +208,9 @@ def show_chat(self, account: str, jid: JID) -> None: self.set_visible_child_name('controls') if old_primary_clipboard is not None: - GLib.idle_add(clipboard.set_text, old_primary_clipboard, -1) + GLib.idle_add(clipboard.set_text, # pyright: ignore + old_primary_clipboard, + -1) GLib.idle_add(self._message_action_box.msg_textview.grab_focus) ===================================== gajim/gtk/const.py ===================================== @@ -224,8 +224,6 @@ def __str__(self): ('set-encryption', 's', 'disabled', False), ('send-chatstate', 's', 'disabled', False), ('send-marker', 'b', False, False), - ('sort-by-show', 'b', 'app-setting:showoffline', True), - ('show-offline', 'b', 'app-setting:sort_by_show_in_roster', True), ] ===================================== gajim/gtk/main.py ===================================== @@ -80,6 +80,7 @@ def __init__(self) -> None: self._add_actions() self._add_actions2() + self._add_stateful_actions() self._startup_finished: bool = False @@ -327,6 +328,25 @@ def _add_actions(self) -> None: act.connect('activate', func) self.add_action(act) + def _add_stateful_actions(self) -> None: + action = Gio.SimpleAction.new_stateful( + 'show-offline', + None, + GLib.Variant('b', app.settings.get('showoffline'))) + + action.connect('change-state', self._on_show_offline) + + self.add_action(action) + + action = Gio.SimpleAction.new_stateful( + 'sort-by-show', + None, + GLib.Variant('b', app.settings.get('sort_by_show_in_roster'))) + + action.connect('change-state', self._on_sort_by_show) + + self.add_action(action) + def _add_actions2(self) -> None: for action, variant_type, enabled in MAIN_WIN_ACTIONS: if variant_type is not None: @@ -336,14 +356,9 @@ def _add_actions2(self) -> None: self.add_action(act) for action, variant_type, default, enabled in MAIN_WIN_STATEFUL_ACTIONS: - - if isinstance(default, str) and default.startswith('app-setting:'): - setting = default.removeprefix('app-setting:') - default = app.settings.get(setting) - action = Gio.SimpleAction.new_stateful( action, - GLib.VariantType(variant_type), + None, GLib.Variant(variant_type, default)) action.set_enabled(enabled) self.add_action(action) @@ -440,6 +455,20 @@ def _on_action(self, return None + def _on_show_offline(self, + action: Gio.SimpleAction, + value: GLib.Variant) -> None: + + action.set_state(value) + app.settings.set('showoffline', value.get_boolean()) + + def _on_sort_by_show(self, + action: Gio.SimpleAction, + value: GLib.Variant) -> None: + + action.set_state(value) + app.settings.set('sort_by_show_in_roster', value.get_boolean()) + def _toggle_chat_list(self) -> None: chat_list_stack = self._chat_page.get_chat_list_stack() chat_list = chat_list_stack.get_current_chat_list() ===================================== gajim/gtk/roster.py ===================================== @@ -133,6 +133,10 @@ def __init__(self, account: str) -> None: self._filter_enabled = False self._filter_string = '' + app.settings.connect_signal('showoffline', self._on_setting_changed) + app.settings.connect_signal('sort_by_show_in_roster', + self._on_setting_changed) + self._connect_actions() self._initial_draw() @@ -144,22 +148,12 @@ def _connect_actions(self): (f'{self._account}-remove-contact', self._on_remove_contact), ] - win_actions = [ - ('show-offline', self._on_show_offline), - ('sort-by-show', self._on_sort_by_show), - ] - for action in app_actions: action_name, func = action action = app.app.lookup_action(action_name) assert action is not None action.connect('activate', func) - for action in win_actions: - action_name, func = action - action = app.window.get_action(action_name) - action.connect('change-state', func) - def _get_contact(self, jid: str) -> types.BareContact: return self._client.get_module('Contacts').get_contact(jid) @@ -268,20 +262,7 @@ def _on_query_tooltip(self, tooltip.set_custom(widget) return value - def _on_show_offline(self, - action: Gio.SimpleAction, - value: Optional[GLib.Variant]) -> None: - - assert value is not None - action.set_state(value) - app.settings.set('showoffline', value.get_boolean()) - self._refilter() - - def _on_sort_by_show(self, - action: Gio.SimpleAction, - value: GLib.Variant) -> None: - action.set_state(value) - app.settings.set('sort_by_show_in_roster', value.get_boolean()) + def _on_setting_changed(self, *args: Any) -> None: self._refilter() def _on_contact_info(self, @@ -751,6 +732,7 @@ def process_event(self, event: ApplicationEvent) -> None: return def _on_destroy(self, _roster: Roster) -> None: + app.settings.disconnect_signals(self) self._contact_refs.clear() self._group_refs.clear() self._unset_model() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c608b9f064ada7b645a7ab93f41824f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c608b9f064ada7b645a7ab93f41824f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Store last_save_dir with Save As
by Daniel Brötzmann (＠wurstsalat) 03 Aug '22

03 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7508f8b7 by wurstsalat at 2022-08-03T14:30:48+02:00 fix: Preview: Store last_save_dir with Save As - - - - - 1 changed file: - gajim/gtk/preview.py Changes: ===================================== gajim/gtk/preview.py ===================================== @@ -267,6 +267,9 @@ def _on_ok(target: str) -> None: transient_for=app.app.get_active_window()) return shutil.copyfile(str(self._preview.orig_path), target_path) + file_dir = os.path.dirname(target_path) + if file_dir: + app.settings.set('last_save_dir', file_dir) if not self._preview.orig_exists: app.preview_manager.download_content(self._preview, force=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7508f8b7f3415c42e3badc9b25932679… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7508f8b7f3415c42e3badc9b25932679… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Make sure the widget is not being destroyed while updating
by Daniel Brötzmann (＠wurstsalat) 02 Aug '22

02 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8a7583ae by wurstsalat at 2022-08-02T21:34:06+02:00 fix: Preview: Make sure the widget is not being destroyed while updating Fixes #10920 - - - - - 2 changed files: - gajim/common/preview.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -143,11 +143,13 @@ def is_aes_encrypted(self) -> bool: return False return self._urlparts.scheme == 'aesgcm' + @property def thumb_exists(self) -> bool: if self.thumb_path is None: return False return self.thumb_path.exists() + @property def orig_exists(self) -> bool: if self.orig_path is None: return False @@ -291,7 +293,7 @@ def create_preview(self, preview = self._process_web_uri(uri, widget, from_us, context) - if not preview.orig_exists(): + if not preview.orig_exists: if context is not None and not from_us: allow_in_public = app.settings.get('preview_anonymous_muc') if context == 'public' and not allow_in_public: @@ -300,7 +302,7 @@ def create_preview(self, self.download_content(preview) - elif not preview.thumb_exists(): + elif not preview.thumb_exists: load_file_async(preview.orig_path, self._on_orig_load_finished, preview) ===================================== gajim/gtk/preview.py ===================================== @@ -41,6 +41,7 @@ from .filechoosers import FileSaveDialog from .preview_audio import AudioWidget from .builder import get_builder +from .util import ensure_not_destroyed from .util import get_cursor from .util import load_icon_pixbuf @@ -54,6 +55,7 @@ def __init__(self, account: str) -> None: self._preview: Optional[Preview] = None self._in_progress = False + self._destroyed = False if app.settings.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS @@ -63,13 +65,20 @@ def __init__(self, account: str) -> None: self._ui = get_builder('preview.ui') self._ui.connect_signals(self) self.add(self._ui.preview_box) + + self.connect('destroy', self._on_destroy) + self.show_all() + def _on_destroy(self, _widget: Gtk.Widget) -> None: + self._destroyed = True + def get_text(self) -> str: if self._preview is None: return '' return self._preview.uri + @ensure_not_destroyed def update_progress(self, _preview: Preview, progress: float) -> None: self._in_progress = True @@ -81,6 +90,7 @@ def update_progress(self, _preview: Preview, progress: float) -> None: self._ui.info_message.set_text(_('Downloading…')) self._ui.info_message.set_tooltip_text('') + @ensure_not_destroyed def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._preview = preview @@ -120,7 +130,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.preview_box.set_size_request(160, -1) return - if preview.is_previewable and preview.orig_exists(): + if preview.is_previewable and preview.orig_exists: self._ui.icon_event_box.hide() self._ui.image_button.show() self._ui.save_as_button.show() @@ -147,7 +157,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.info_message.set_tooltip_text(preview.info_message) self._ui.info_message.show() - if preview.orig_exists(): + if preview.orig_exists: self._ui.download_button.hide() self._ui.open_folder_button.show() self._ui.save_as_button.show() @@ -201,7 +211,7 @@ def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: menu.open_folder.hide() return menu.context_menu - if self._preview.orig_exists(): + if self._preview.orig_exists: menu.download.hide() else: if self._in_progress: @@ -215,7 +225,7 @@ def _destroy(menu: Gtk.Menu, _pspec: Any) -> None: def _on_download(self, _menu: Gtk.Menu) -> None: if self._preview is None: return - if not self._preview.orig_exists(): + if not self._preview.orig_exists: app.preview_manager.download_content(self._preview, force=True) def _on_open(self, _menu: Gtk.Menu) -> None: @@ -226,7 +236,7 @@ def _on_open(self, _menu: Gtk.Menu) -> None: open_uri(self._preview.uri) return - if not self._preview.orig_exists(): + if not self._preview.orig_exists: app.preview_manager.download_content(self._preview, force=True) return @@ -258,7 +268,7 @@ def _on_ok(target: str) -> None: return shutil.copyfile(str(self._preview.orig_path), target_path) - if not self._preview.orig_exists(): + if not self._preview.orig_exists: app.preview_manager.download_content(self._preview, force=True) return @@ -269,7 +279,7 @@ def _on_ok(target: str) -> None: def _on_open_folder(self, _menu: Gtk.Menu) -> None: assert self._preview - if not self._preview.orig_exists(): + if not self._preview.orig_exists: app.preview_manager.download_content(self._preview, force=True) return assert self._preview.orig_path View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a7583aeda6e368e26b0f1ffe2edcb91… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8a7583aeda6e368e26b0f1ffe2edcb91… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] cs: Fix quotes
by Philipp Hörist (＠lovetox) 01 Aug '22

01 Aug '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: c608b9f0 by lovetox at 2022-08-01T23:02:50+02:00 cs: Fix quotes - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -627,7 +627,7 @@ def _on_paste_clipboard(self, _('Paste Image'), _('You are trying to paste an image'), _('Are you sure you want to paste your ' - 'clipboard\'s image into the chat window?'), + "clipboard's image into the chat window?"), _('_Do not ask me again'), image, [DialogButton.make('Cancel'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c608b9f064ada7b645a7ab93f41824fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c608b9f064ada7b645a7ab93f41824fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] refactor: Update GroupchatState on creation
by Philipp Hörist (＠lovetox) 01 Aug '22

01 Aug '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: e24da5f9 by lovetox at 2022-08-01T22:13:19+02:00 refactor: Update GroupchatState on creation - - - - - 1 changed file: - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -28,6 +28,7 @@ def __init__(self, contact: GroupchatContact) -> None: Gtk.Box.__init__(self) self.set_halign(Gtk.Align.CENTER) self.set_valign(Gtk.Align.END) + self.set_no_show_all(True) self._contact = contact self._contact.connect('state-changed', self._on_muc_state_changed) @@ -37,29 +38,22 @@ def __init__(self, contact: GroupchatContact) -> None: self.add(self._ui.groupchat_state) self.show_all() + self._update_state(contact) + def _on_muc_state_changed(self, contact: GroupchatContact, _signal_name: str ) -> None: - if contact.is_joining: - self._set_joining() - - if contact.is_joined: - self._set_joined() + self._update_state(contact) - if contact.is_not_joined: - self._set_not_joined() - - def _set_joining(self) -> None: - self._ui.groupchat_state.set_visible_child_name('joining') + def _update_state(self, contact: GroupchatContact) -> None: + if contact.is_joining: + self._ui.groupchat_state.set_visible_child_name('joining') - def _set_joined(self) -> None: - self.hide() - self.set_no_show_all(True) + elif contact.is_not_joined: + self._ui.groupchat_state.set_visible_child_name('not-joined') - def _set_not_joined(self) -> None: - self._ui.groupchat_state.set_visible_child_name('not-joined') - self.show() + self.set_visible(not contact.is_joined) def set_fetching(self) -> None: self._ui.groupchat_state.set_visible_child_name('fetching') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e24da5f98913b18cc59b5d8c8f3d913e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e24da5f98913b18cc59b5d8c8f3d913e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update DOAP file
by Daniel Brötzmann (＠wurstsalat) 01 Aug '22

01 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a4008f77 by Daniel Brötzmann at 2022-08-01T13:12:05+00:00 chore: Update DOAP file - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -28,6 +28,7 @@ <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-client"/> <category rdf:resource="http://api.gnome.org/doap-extensions#apps"/> <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3"/> + <schema:logo rdf:resource="https://gajim.org/img/gajim-logo.svg"/> <schema:screenshot rdf:resource="https://gajim.org/img/screenshots/single-window-mode.png"/> @@ -35,9 +36,6 @@ <os>Linux</os> <os>Windows</os> - <category rdf:resource='https://linkmauve.fr/ns/xmpp-doap#category-client'/> - <category rdf:resource="http://api.gnome.org/doap-extensions#apps"/> - <repository> <GitRepository> <location rdf:resource="https://dev.gajim.org/gajim/gajim.git"/> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4008f7733c6d9c7ce46686590dc833e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4008f7733c6d9c7ce46686590dc833e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] chore: Update DOAP file
by Daniel Brötzmann (＠wurstsalat) 01 Aug '22

01 Aug '22

Daniel Brötzmann pushed to branch master at gajim / python-nbxmpp Commits: ee0c8772 by Daniel Brötzmann at 2022-08-01T13:10:23+00:00 chore: Update DOAP file - - - - - 1 changed file: - python-nbxmpp.doap Changes: ===================================== python-nbxmpp.doap ===================================== @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="https://gajim.org/files/doap-style.xsl" type="text/xsl"?> <rdf:RDF xmlns="http://usefulinc.com/ns/doap#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#" - xmlns:foaf="http://xmlns.com/foaf/0.1/"> + xmlns:xmpp="https://linkmauve.fr/ns/xmpp-doap#"> <Project> - <name>python-nbxmpp</name> <short-name>nbxmpp</short-name> - <shortdesc xml:lang="en">XMPP Library</shortdesc> + <created>2012-05-08</created> + + <shortdesc xml:lang="en">Python XMPP Library</shortdesc> <description xml:lang="en"> python-nbxmpp is a Python library that provides a way for Python applications to use the XMPP network. This library was initially a fork of xmpppy. </description> - <homepage rdf:resource="https://gajim.org/" /> - <wiki rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/home" /> - <bug-database rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/issues" /> - <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-library" /> - <category rdf:resource="http://api.gnome.org/doap-extensions#apps" /> - <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3" /> + <homepage rdf:resource="https://gajim.org/"/> + <wiki rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/wikis/home"/> + <bug-database rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp/-/issues"/> + <category rdf:resource="https://linkmauve.fr/ns/xmpp-doap#category-library"/> + <category rdf:resource="http://api.gnome.org/doap-extensions#apps"/> + <license rdf:resource="http://usefulinc.com/doap/licenses/gplv3"/> <programming-language>Python</programming-language> <os>Linux</os> @@ -27,40 +28,40 @@ <repository> <GitRepository> - <location rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp.git" /> - <browse rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp" /> + <location rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp.git"/> + <browse rdf:resource="https://dev.gajim.org/gajim/python-nbxmpp"/> </GitRepository> </repository> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html" /> - <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html" /> - <implements rdf:resource="https://tools.ietf.org/html/rfc7395" /> - <implements rdf:resource="https://tools.ietf.org/html/rfc7590" /> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6120.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6121.html"/> + <implements rdf:resource="https://xmpp.org/rfcs/rfc6122.html"/> + <implements rdf:resource="https://tools.ietf.org/html/rfc7395"/> + <implements rdf:resource="https://tools.ietf.org/html/rfc7590"/> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0004.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.9</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0027.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0030.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0045.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.31.2</xmpp:version> <xmpp:note>All basics stuff is supported. Also, some more advanced features like invitations, creation of rooms, etc.</xmpp:note> @@ -68,35 +69,35 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0047.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0047.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0048.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0050.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0054.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0059.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Used by XEP-0313.</xmpp:note> @@ -104,126 +105,126 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0060.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.13</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0066.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.5</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0070.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0070.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0077.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.4</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0080.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.9</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0082.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0085.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0092.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.1.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0115.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.5</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0118.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0118.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0145.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0145.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0153.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0158.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>Images only.</xmpp:note> @@ -231,49 +232,49 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0172.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0184.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0191.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0203.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>2.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0224.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0231.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>1.0</xmpp:version> <xmpp:note>No cache: Only for captchas.</xmpp:note> @@ -281,84 +282,84 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0233.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0233.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0258.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0280.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.12.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0292.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0292.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.10</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0308.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0313.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.6.3</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0319.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0.2</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0363.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.7.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0368.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.0.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0373.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.4.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0377.html"/> <xmpp:status>partial</xmpp:status> <xmpp:version>0.2</xmpp:version> <xmpp:note>Basic Spam/Abuse reporting via XEP-0191</xmpp:note> @@ -366,35 +367,35 @@ </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0380.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0380.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.1</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0392.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.6.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0402.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.3.0</xmpp:version> </xmpp:SupportedXep> </implements> <implements> <xmpp:SupportedXep> - <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html" /> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>0.2.1</xmpp:version> </xmpp:SupportedXep> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ee0c877271ec9ead3b81c16f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ee0c877271ec9ead3b81c16f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 2 commits: chore: MessageActionBox: Add asserts
by Daniel Brötzmann (＠wurstsalat) 31 Jul '22

31 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: ef7e143b by wurstsalat at 2022-07-31T23:24:14+02:00 chore: MessageActionBox: Add asserts - - - - - 9994e499 by wurstsalat at 2022-07-31T23:24:50+02:00 chore: Main: Adapt _on_window_motion_notify - - - - - 3 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -142,6 +142,9 @@ def process_escape(self) -> bool: def get_control_stack(self) -> ControlStack: return self._control_stack + def get_message_action_box(self) -> MessageActionsBox: + return self._message_action_box + def show_chat(self, account: str, jid: JID) -> None: # Store (preserve) primary clipboard and restore it after switching clipboard = Gtk.Clipboard.get(Gdk.SELECTION_PRIMARY) ===================================== gajim/gtk/main.py ===================================== @@ -464,12 +464,12 @@ def _on_window_motion_notify(self, if control is None: return - return - # TODO if self.get_property('has-toplevel-focus'): client = app.get_client(control.account) + chat_stack = self._chat_page.get_chat_stack() + msg_action_box = chat_stack.get_message_action_box() client.get_module('Chatstate').set_mouse_activity( - control.contact, control.msg_textview.has_text()) + control.contact, msg_action_box.msg_textview.has_text()) def _on_window_delete(self, _widget: Gtk.ApplicationWindow, ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -121,6 +121,7 @@ def __init__(self) -> None: self._connect_actions() def _get_encryption_state(self) -> tuple[bool, str]: + assert self._contact is not None encryption = self._contact.settings.get('encryption') return bool(encryption), encryption @@ -310,7 +311,9 @@ def _change_encryption(self, ) -> None: new_state = param.get_string() - current_state = action.get_state().get_string() + action_state = action.get_state() + assert action_state is not None + current_state = action_state.get_string() if current_state == new_state: return @@ -493,6 +496,7 @@ def _update_send_file_button_tooltip(self): self._ui.sendfile_button.set_tooltip_text(tooltip_text) return + assert self._contact is not None client = app.get_client(self._contact.account) tooltip_text = _('Send File…') @@ -593,6 +597,7 @@ def _on_msg_textview_key_press_event(self, textview.insert_newline() return True + assert self._contact is not None if not app.account_is_available(self._contact.account): # we are not connected ErrorDialog( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4486547a7f2e0fd65ad6f37ee6b52f3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4486547a7f2e0fd65ad6f37ee6b52f3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Settings: Use correct type for set_contact_settings
by Daniel Brötzmann (＠wurstsalat) 31 Jul '22

31 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4587ceae by wurstsalat at 2022-07-31T21:27:51+02:00 chore: Settings: Use correct type for set_contact_settings - - - - - 426cc3ee by wurstsalat at 2022-07-31T21:28:18+02:00 chore: ConversationView: Add type annotations - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/settings.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -20,8 +20,6 @@ from typing import Union from typing import overload -from functools import partial - import cairo from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate ===================================== gajim/common/settings.py ===================================== @@ -1029,7 +1029,7 @@ def set_contact_setting(self, def set_contact_settings(self, setting: str, - value: AllContactSettings) -> None: + value: SETTING_TYPE) -> None: for account, acc_settings in self._account_settings.items(): for jid in acc_settings['contact']: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day +from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.common.storage.archive import ConversationRow from gajim.common.modules.contacts import BareContact @@ -183,6 +184,7 @@ def add_muc_user_left(self, nick: str, reason: str, error: bool = False) -> None: + assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-left', @@ -193,6 +195,7 @@ def add_muc_user_left(self, self._insert_message(join_left) def add_muc_user_joined(self, nick: str) -> None: + assert isinstance(self._contact, GroupchatContact) if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-joined', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f77737b0049e996e7443d868aecc103… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f77737b0049e996e7443d868aecc103… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Settings: Add type annotations for Contact settings
by Daniel Brötzmann (＠wurstsalat) 31 Jul '22

31 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f77737b0 by wurstsalat at 2022-07-31T20:59:02+02:00 chore: Settings: Add type annotations for Contact settings - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/common/settings.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -37,6 +37,8 @@ from gajim.common import types from gajim.common.const import PresenceShowExt from gajim.common.const import SimpleClientState +from gajim.common.setting_values import BoolContactSettings +from gajim.common.setting_values import StringContactSettings from gajim.common.setting_values import BoolGroupChatSettings from gajim.common.setting_values import IntGroupChatSettings from gajim.common.setting_values import StringGroupChatSettings @@ -52,8 +54,26 @@ class ContactSettings: def __init__(self, account: str, jid: JID) -> None: - self.get = partial(app.settings.get_contact_setting, account, jid) - self.set = partial(app.settings.set_contact_setting, account, jid) + self._account = account + self._jid = jid + + @overload + def get(self, setting: StringContactSettings) -> str: ... # noqa: E704 + @overload + def get(self, setting: BoolContactSettings) -> bool: ... # noqa: E704 + + def get(self, setting: Any) -> Any: + return app.settings.get_contact_setting( + self._account, self._jid, setting) + + @overload + def set(self, setting: StringContactSettings, value: str) -> None: ... # noqa: E501, E704 + @overload + def set(self, setting: BoolContactSettings, value: bool) -> None: ... # noqa: E501, E704 + + def set(self, setting: Any, value: Any) -> None: + app.settings.set_contact_setting( + self._account, self._jid, setting, value) class GroupChatSettings: ===================================== gajim/common/setting_values.py ===================================== @@ -405,6 +405,23 @@ class _ACCOUNT_DEFAULT: AllGroupChatSettingsT = Union[str, int, bool] + +BoolContactSettings = Literal[ + 'send_marker', +] + +StringContactSettings = Literal[ + 'encryption', + 'speller_language', + 'send_chatstate', +] + +AllContactSettings = Literal[BoolContactSettings, + StringContactSettings] + +AllContactSettingsT = Union[str, bool] + + ACCOUNT_SETTINGS = { 'account': { 'account_color': 'rgb(85, 85, 85)', ===================================== gajim/common/settings.py ===================================== @@ -45,6 +45,10 @@ from gajim.common.storage.base import Encoder from gajim.common.storage.base import json_decoder from gajim.common.setting_values import APP_SETTINGS +from gajim.common.setting_values import AllContactSettings +from gajim.common.setting_values import AllContactSettingsT +from gajim.common.setting_values import BoolContactSettings +from gajim.common.setting_values import StringContactSettings from gajim.common.setting_values import AllGroupChatSettings from gajim.common.setting_values import AllGroupChatSettingsT from gajim.common.setting_values import BoolGroupChatSettings @@ -923,10 +927,27 @@ def set_group_chat_settings(self, continue self.set_group_chat_setting(account, jid, setting, value) + @overload def get_contact_setting(self, account: str, jid: JID, - setting: str) -> SETTING_TYPE: + setting: BoolContactSettings + ) -> bool: + ... + + @overload + def get_contact_setting(self, + account: str, + jid: JID, + setting: StringContactSettings + ) -> str: + ... + + def get_contact_setting(self, + account: str, + jid: JID, + setting: AllContactSettings + ) -> AllContactSettingsT: if account not in self._account_settings: raise ValueError(f'Account missing: {account}') @@ -946,11 +967,27 @@ def get_contact_setting(self, return default + @overload def set_contact_setting(self, account: str, jid: JID, - setting: str, - value: SETTING_TYPE) -> None: + setting: StringContactSettings, + value: str) -> None: + ... + + @overload + def set_contact_setting(self, + account: str, + jid: JID, + setting: BoolContactSettings, + value: bool) -> None: + ... + + def set_contact_setting(self, + account: str, + jid: JID, + setting: AllContactSettings, + value: AllContactSettingsT) -> None: if account not in self._account_settings: raise ValueError(f'Account missing: {account}') @@ -992,7 +1029,7 @@ def set_contact_setting(self, def set_contact_settings(self, setting: str, - value: SETTING_TYPE) -> None: + value: AllContactSettings) -> None: for account, acc_settings in self._account_settings.items(): for jid in acc_settings['contact']: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f77737b0049e996e7443d868aecc1034… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f77737b0049e996e7443d868aecc1034… 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