Commits November 2022

commits@gajim.org

1 participants
102 discussions

[Git][gajim/gajim][master] fix: MessageInputTextView: Reintroduce gui_extension_point
by Daniel Brötzmann (＠wurstsalat) 29 Nov '22

29 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 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 - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -112,7 +112,7 @@ def __init__(self) -> None: self._language_handler_id = self._init_spell_checker() app.settings.connect_signal('use_speller', self._on_toggle_spell_check) - app.plugin_manager.extension_point('message_input', self) + app.plugin_manager.gui_extension_point('message_input', self) @property def is_correcting(self) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/806d47574ab2b104023b8d7b4749e584… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/806d47574ab2b104023b8d7b4749e584… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: AccountWizard: Improve type annotations
by Daniel Brötzmann (＠wurstsalat) 28 Nov '22

28 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d4c21af6 by wurstsalat at 2022-11-28T18:48:06+01:00 cq: AccountWizard: Improve type annotations - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -215,7 +215,9 @@ def _on_assistant_button_clicked(self, elif button_name == 'connect': if page == 'success': - app.app.enable_account(self.get_page('success').account) + account = self.get_page('success').account + assert account is not None + app.app.enable_account(account) self.destroy() elif button_name == 'back': @@ -787,7 +789,7 @@ def __init__(self) -> None: @staticmethod def _on_proxy_manager(_button: Gtk.Button) -> None: - app.app.activate_action('manage-proxies') + app.app.activate_action('manage-proxies', None) def update_proxy_list(self) -> None: model = Gtk.ListStore(str) @@ -1001,10 +1003,12 @@ def add_form(self, form: Any) -> None: self._current_form.show_all() def get_credentials(self) -> tuple[str, str]: + assert self._current_form is not None return (self._current_form.get_form()['username'].value, self._current_form.get_form()['password'].value) def get_submit_form(self) -> Any: + assert self._current_form is not None return self._current_form.get_submit_form() def remove_form(self) -> None: @@ -1016,6 +1020,7 @@ def remove_form(self) -> None: self._current_form = None def focus(self) -> None: + assert self._current_form is not None self._current_form.focus_first_entry() def get_visible_buttons(self) -> list[str]: @@ -1093,6 +1098,7 @@ def _add_css_provider(self) -> Gtk.CssProvider: return provider def _on_name_changed(self, entry: Gtk.Entry): + assert self._our_jid is not None self._label = entry.get_text() self._ui.badge_preview.set_text(self._label or self._our_jid) self._save_config() @@ -1108,6 +1114,7 @@ def _set_badge_color(self, color: str) -> None: self._provider.load_from_data(bytes(css.encode())) def _save_config(self) -> None: + assert self._account is not None app.settings.set_account_setting( self._account, 'account_color', self._color) if self._label: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4c21af6c91c57a29b7e04dfad4ccdf5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d4c21af6c91c57a29b7e04dfad4ccdf5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update builder.pyi
by Daniel Brötzmann (＠wurstsalat) 28 Nov '22

28 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4b6f68da by wurstsalat at 2022-11-28T18:10:11+01:00 chore: Update builder.pyi - - - - - 1 changed file: - gajim/gtk/builder.pyi Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -687,17 +687,6 @@ class PreviewBuilder(Builder): info_message: Gtk.Label -class PreviewContextMenuBuilder(Builder): - context_menu: Gtk.Menu - download: Gtk.MenuItem - open: Gtk.MenuItem - save_as: Gtk.MenuItem - open_folder: Gtk.MenuItem - encryption_separator: Gtk.SeparatorMenuItem - copy_link_location: Gtk.MenuItem - open_link_in_browser: Gtk.MenuItem - - class ProfileBuilder(Builder): privacy_popover: Gtk.Popover avatar_nick_access: Gtk.Switch @@ -1022,8 +1011,6 @@ def get_builder(file_name: Literal['preferences.ui'], widgets: list[str] = ...) @overload def get_builder(file_name: Literal['preview.ui'], widgets: list[str] = ...) -> PreviewBuilder: ... @overload -def get_builder(file_name: Literal['preview_context_menu.ui'], widgets: list[str] = ...) -> PreviewContextMenuBuilder: ... -@overload def get_builder(file_name: Literal['profile.ui'], widgets: list[str] = ...) -> ProfileBuilder: ... @overload def get_builder(file_name: Literal['roster.ui'], widgets: list[str] = ...) -> RosterBuilder: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6f68dabf446ad4718006c279e2d563… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6f68dabf446ad4718006c279e2d563… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Message selection: Use date_time_format instead of time_format
by Daniel Brötzmann (＠wurstsalat) 28 Nov '22

28 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 020230b5 by wurstsalat at 2022-11-28T10:29:41+01:00 imprv: Message selection: Use date_time_format instead of time_format - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -144,7 +144,7 @@ def __init__(self) -> None: 'activate', self._on_scroll_view) def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('time_format')) + time_format = from_one_line(app.settings.get('date_time_format')) selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/020230b52c3dd58b16869aae8f368467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/020230b52c3dd58b16869aae8f368467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Settings: Unify timestamp settings
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0032cd9 by wurstsalat at 2022-11-27T23:36:19+00:00 imprv: Settings: Unify timestamp settings Part of #10948 - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -132,9 +132,9 @@ class _ACCOUNT_DEFAULT: 'audio_output_device', 'autoaway_message', 'autoxa_message', - 'chat_timestamp_format', 'confirm_block', - 'date_timestamp_format', + 'date_format', + 'date_time_format', 'dictionary_url', 'emoticons_theme', 'gc_refer_to_nick_char', @@ -154,6 +154,7 @@ class _ACCOUNT_DEFAULT: 'show_main_window_on_startup', 'speller_language', 'stun_server', + 'time_format', 'video_framerate', 'video_input_device', 'video_size', @@ -180,13 +181,13 @@ class _ACCOUNT_DEFAULT: 'autoxatime': 15, 'chat_handle_position': 350, 'chat_merge_consecutive_nickname': True, - 'chat_timestamp_format': '%H:%M', 'check_for_update': True, 'confirm_block': '', 'confirm_close_muc': True, 'confirm_on_window_delete': True, 'dark_theme': 2, - 'date_timestamp_format': '%x', + 'date_format': '%x', + 'date_time_format': '%c', 'dev_force_bookmark_2': False, 'dev_use_message_label': True, 'developer_modus': False, @@ -268,6 +269,7 @@ class _ACCOUNT_DEFAULT: 'sounds_on': True, 'speller_language': '', 'stun_server': '', + 'time_format': '%H:%M', 'trayicon_notification_on_events': True, 'use_keyring': True, 'use_kib_mib': False, @@ -635,14 +637,14 @@ class WorkspaceSettings(TypedDict): 'Show message meta data (avatar, nickname, timestamp) only once, ' 'if there are multiple messages from the same sender within a ' 'specific timespan.'), - 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'confirm_block': _( 'Show a confirmation dialog to block a contact? Empty string ' 'means never show the dialog.'), 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_on_window_delete': _( 'Ask before quitting when Gajim’s window is closed'), - 'date_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 + 'date_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 + 'date_time_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), 'dev_use_message_label': '', 'developer_modus': '', @@ -691,6 +693,7 @@ class WorkspaceSettings(TypedDict): 'show_chatstate_in_banner': _( 'Show chat state (e.g. "is typing…") next to your contact’s name'), 'stun_server': _('STUN server to use when using Jingle'), + 'time_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'trayicon_notification_on_events': _( 'Notify of events in the notification area.'), 'use_kib_mib': _( ===================================== gajim/common/settings.py ===================================== @@ -359,6 +359,17 @@ def _migrate(self) -> None: self._set_user_version(3) + if version < 4: + value = self._settings['app'].get('chat_timestamp_format') + if value is not None: + self._settings['app']['time_format'] = value + + value = self._settings['app'].get('date_timestamp_format') + if value is not None: + self._settings['app']['date_format'] = value + + self._set_user_version(4) + def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') if not config_file.exists(): ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -93,9 +93,9 @@ class DateTimeLabel(Gtk.Label): def __init__(self, timestamp: datetime) -> None: Gtk.Label.__init__(self) - time_format = app.settings.get('chat_timestamp_format') + time_format = app.settings.get('time_format') if timestamp.date() < datetime.today().date(): - date_format = app.settings.get('date_timestamp_format') + date_format = app.settings.get('date_format') time_format = f'{time_format} - {date_format}' timestamp_formatted = timestamp.strftime(time_format) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -144,7 +144,7 @@ def __init__(self) -> None: 'activate', self._on_scroll_view) def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('chat_timestamp_format')) + time_format = from_one_line(app.settings.get('time_format')) selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): ===================================== gajim/gtk/menus.py ===================================== @@ -613,7 +613,7 @@ def get_chat_row_menu(contact: types.ChatContactT, text = text.replace('"', '\\"') - time_format = from_one_line(app.settings.get('chat_timestamp_format')) + time_format = from_one_line(app.settings.get('time_format')) timestamp_formatted = timestamp.strftime(time_format) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0032cd9e615fda7961996d6a2a37196… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0032cd9e615fda7961996d6a2a37196… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch time-formats
by Daniel Brötzmann (＠wurstsalat) 27 Nov '22

27 Nov '22

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

1 0

[Git][gajim/gajim][time-formats] 23 commits: fix: Chatstates: Switch to Chatstate.ACTIVE after timeout
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch time-formats at gajim / gajim Commits: 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 - - - - - 30 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.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/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/preview.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/socks5.py - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - − gajim/data/gui/preview_context_menu.ui - − gajim/data/other/dh4096.pem - gajim/data/style/gajim.css - gajim/gtk/avatar.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/532a2f562790682ba73a91d3e580ac2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/532a2f562790682ba73a91d3e580ac2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Add cryptography to build dependencies
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fde324b2 by Philipp Hörist at 2022-11-27T23:50:02+01:00 ci: Debian: Add cryptography to build dependencies - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -14,6 +14,7 @@ Build-Depends: python3-nbxmpp-nightly (>=20221027), python3-setuptools, python3-packaging, + python3-cryptography (>=3.4.8), python3-pil, gir1.2-gtk-3.0 (>=3.24.30), gir1.2-gtksource-4, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fde324b2a675d4a14aefc46874ca8301… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fde324b2a675d4a14aefc46874ca8301… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add ruff configuration
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf75d672 by Philipp Hörist at 2022-11-27T23:43:04+01:00 ci: Add ruff configuration - - - - - 1 changed file: - pyproject.toml Changes: ===================================== pyproject.toml ===================================== @@ -149,3 +149,70 @@ include = [ "gajim/plugins/plugins_i18n.py", "gajim/plugins/repository.py", ] + + +[tool.ruff] +line-length = 80 + +select = [ + "A", # flake8-builtins + # "ANN", # flake8-annotations + "B", # flake8-bugbear + "BLE", # flake8-blind-except + "C", # flake8-comprehensions + "C901", # mccabe + # "D", # pydocstyle + "E", # pycodestyle + "F", # pyflakes + "FBT", # flake8-boolean-trap + # "I", # flake8-tidy-imports, isort + "M", # Meta rules + "N", # pep8-naming + "Q", # flake8-quotes + "RUF", # Ruff-specific rules + "S", # flake8-bandit + "T", # flake8-debugger, flake8-print + "U", # pyupgrade + "W", # pycodestyle + "YTT", # flake8-2020 +] + +ignore = [ + "S101", # Use of `assert` detected + "FBT003", # Boolean positional value in function call + "BLE001", # Blind except Exception: statement +] + +exclude = [ + ".eggs", + ".git", + ".ruff_cache", + ".venv", + "build", + "dist", + "venv", + "*.pyi", + # Code Folders + "gajim/gui", + "typings", + "gajim/common/config.py", # legacy module, will be removed + "gajim/common/optparser.py", # legacy module, will be removed + "gajim/common/socks5.py", # legacy module, will be removed +] + +# Allow unused variables when underscore-prefixed. +dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" +target-version = "py39" + +[tool.ruff.per-file-ignores] +"test/*" = ["E402"] +"test/no_gui/test_styling.py" = ["RUF001"] + + +[tool.ruff.mccabe] +max-complexity = 15 + +[tool.ruff.flake8-quotes] +inline-quotes = "single" +docstring-quotes = "single" +multiline-quotes = "single" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf75d67255aa91aa1e161cb599ff6ed1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf75d67255aa91aa1e161cb599ff6ed1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch cert-convert-cryptography
by Daniel Brötzmann (＠wurstsalat) 27 Nov '22

27 Nov '22

Daniel Brötzmann deleted branch cert-convert-cryptography at gajim / gajim -- 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 November 2022