Commits March 2023

commits@gajim.org

1 participants
44 discussions

[Git][gajim/gajim][omemo_integration] 48 commits: fix: Fix nickname highlight in group chats
by Daniel Brötzmann (＠wurstsalat) 26 Mar '23

26 Mar '23

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 8c1cfd90 by wurstsalat at 2023-02-24T10:12:12+01:00 fix: Fix nickname highlight in group chats Fixes #11413 - - - - - 0b0f9ba9 by wurstsalat at 2023-03-02T09:25:03+01:00 fix: Notifications: Honor notification_preview_message setting - - - - - 535f7b44 by Daniel Brötzmann at 2023-03-02T09:21:55+00:00 imprv: Windows installer: Add Polish language - - - - - 79923364 by wurstsalat at 2023-03-03T09:30:13+01:00 cfix: Windows installer: Save files using UTF-8 with BOM, convert intendation to spaces - - - - - bda77f26 by Michel Le Bihan at 2023-03-05T16:57:08+00:00 imprv: Declare that the installer is DPI-aware - - - - - bc14c535 by wurstsalat at 2023-03-09T18:59:28+00:00 fix: Don't fail if contact name for MUC message is None Fixes #11417 - - - - - 526782cc by wurstsalat at 2023-03-09T19:07:36+00:00 fix: Show chat notifications when chat page is not visible Fixes #11416 - - - - - 73e3ee88 by mesonium at 2023-03-09T15:03:07-05:00 cfix: Update links to GNOME Gtk and GLib repo - - - - - 67443ab9 by Nicoco at 2023-03-11T18:33:40+00:00 fix: Chatstates: Remove composing timeout correctly - - - - - f9058e21 by Philipp Hörist at 2023-03-11T19:48:30+01:00 fix: HTTPUpload: Respect infinite file size limit Fixes #11436 - - - - - 44cbd2ff by Philipp Hörist at 2023-03-11T19:55:05+01:00 fix: Migration: Don’t fail on color setting migration Fixes #11426 - - - - - 7d8e24a6 by Weblate at 2023-03-11T20:25:41+01:00 chore: Update translations - - - - - 2b0a1423 by Philipp Hörist at 2023-03-11T20:29:35+01:00 release: 1.7.2 - - - - - ab6c80fe by Philipp Hörist at 2023-03-12T12:48:03+01:00 other: Update release issue template - - - - - d3fee1d9 by Philipp Hörist at 2023-03-14T23:18:33+01:00 cq: Improve various type annotations - - - - - 3b63be08 by lovetox at 2023-03-26T14:25:46+02:00 Omemo Start - - - - - f05db7be by wurstsalat at 2023-03-26T14:25:47+02:00 cq: OMEMO: Add type annotations - - - - - 025a35fa by wurstsalat at 2023-03-26T14:25:47+02:00 cq: OMEMO: Fix linting errors - - - - - 7b5e772f by wurstsalat at 2023-03-26T14:25:47+02:00 cq: Add type stubs for python-qrcode - - - - - 709b5645 by wurstsalat at 2023-03-26T14:25:47+02:00 chore: Adapt dependencies for OMEMO - - - - - afe010e0 by wurstsalat at 2023-03-26T14:25:47+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - 97b45a65 by wurstsalat at 2023-03-26T14:25:47+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - 2d204fac by wurstsalat at 2023-03-26T14:25:47+02:00 new: Add OMEMOTrustManager - - - - - ea4aa93f by wurstsalat at 2023-03-26T14:25:47+02:00 new: OMEMO: Add file encryption - - - - - ce650f64 by Philipp Hörist at 2023-03-26T14:25:47+02:00 chore: Update dependencies - - - - - 3144f911 by Philipp Hörist at 2023-03-26T14:25:47+02:00 new: Block omemo plugin - - - - - f722f579 by wurstsalat at 2023-03-26T14:25:47+02:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 9d84581b by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Move omemo storage to storage module - - - - - 75d2f41f by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Move omemo code into common - - - - - 56c64108 by Philipp Hörist at 2023-03-26T14:25:47+02:00 cq: Fix linter errors - - - - - c52f43d5 by wurstsalat at 2023-03-26T14:25:47+02:00 new: OMEMO: Add handling of MucAdded signal - - - - - ee6dea68 by wurstsalat at 2023-03-26T14:25:47+02:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - a17c9867 by Philipp Hörist at 2023-03-26T14:25:47+02:00 fix: check preconditions - - - - - 02ed4ca9 by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Rename methods - - - - - 640160bb by Philipp Hörist at 2023-03-26T14:25:47+02:00 cq: Remove blank line - - - - - 37ada7a5 by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Remove unused code - - - - - 1a01ce5f by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Use send_stanza method - - - - - af91c77c by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Remove devices module - - - - - 8c093ad7 by Philipp Hörist at 2023-03-26T14:25:47+02:00 cq: Remove unused imports - - - - - f2680165 by Philipp Hörist at 2023-03-26T14:25:47+02:00 refactor: Switch to new library - - - - - e7fb7bb1 by Philipp Hörist at 2023-03-26T14:25:47+02:00 cq: Fix storage annotations - - - - - 34d500d4 by Philipp Hörist at 2023-03-26T14:25:47+02:00 fix: Fix import - - - - - 259dd990 by wurstsalat at 2023-03-26T14:25:47+02:00 Fix typo in flatpak files - - - - - 28f57287 by wurstsalat at 2023-03-26T14:25:47+02:00 Enable users to copy their fingerprints - - - - - 152669be by wurstsalat at 2023-03-26T14:25:47+02:00 Fix HTTPUpload method call - - - - - 8c7e4a78 by wurstsalat at 2023-03-26T14:25:47+02:00 OMEMOTrustManager: Fix leaks - - - - - 45c78dd4 by wurstsalat at 2023-03-26T14:25:47+02:00 Run isort - - - - - 22a45502 by wurstsalat at 2023-03-26T14:25:47+02:00 cq: Fix linting errors - - - - - 30 changed files: - .gitlab/issue_templates/Release.md - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/optparser.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - + gajim/common/storage/omemo.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0b9ae2d71d0efdaf15cc52443011f9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0b9ae2d71d0efdaf15cc52443011f9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.2.2
by Philipp Hörist (＠lovetox) 25 Mar '23

25 Mar '23

Philipp Hörist pushed new tag 4.2.2 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.2.2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] release: 4.2.2
by Philipp Hörist (＠lovetox) 25 Mar '23

25 Mar '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9225124e by Philipp Hörist at 2023-03-25T17:33:26+01:00 release: 4.2.2 - - - - - 2 changed files: - ChangeLog - nbxmpp/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,9 @@ +nbxmpp 4.2.2 (25 Mar 2023) + + Bug Fixes + + * HTTP: Reset attributes on redirect (#141) + nbxmpp 4.2.1 (18 Mar 2023) Bug Fixes ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '4.2.1' +__version__: str = '4.2.2' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9225124e8648aca13071568d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9225124e8648aca13071568d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: HTTP: Reset attributes on redirect
by Philipp Hörist (＠lovetox) 25 Mar '23

25 Mar '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8be061c9 by Philipp Hörist at 2023-03-25T17:18:35+01:00 fix: HTTP: Reset attributes on redirect Fixes #141 - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -276,6 +276,7 @@ class HTTPRequest(GObject.GObject): self._message.connect('content-sniffed', self._on_content_sniffed) self._message.connect('got-body', self._on_got_body) + self._message.connect('restarted', self._on_restarted) self._message.connect('finished', self._on_finished) soup_session = self._session.get_soup_session() @@ -431,6 +432,12 @@ class HTTPRequest(GObject.GObject): self._log.info('Body received') self._body_received = True + def _on_restarted(self, _message: Soup.Message) -> None: + self._log.info('Restarted') + self._body_received = False + self._response_content_type = '' + self._response_content_length = 0 + def _on_finished(self, _message: Soup.Message) -> None: self._log.info('Message finished') if not self._body_received: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8be061c93b261c199ca8e707… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8be061c93b261c199ca8e707… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.2.1
by Philipp Hörist (＠lovetox) 18 Mar '23

18 Mar '23

Philipp Hörist pushed new tag 4.2.1 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.2.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] release: 4.2.1
by Philipp Hörist (＠lovetox) 18 Mar '23

18 Mar '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 10fe142b by Philipp Hörist at 2023-03-18T20:05:52+01:00 release: 4.2.1 - - - - - 2 changed files: - ChangeLog - nbxmpp/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,9 @@ +nbxmpp 4.2.1 (18 Mar 2023) + + Bug Fixes + + * HTTP: Make sure streams are closed only once (#139) + nbxmpp 4.2.0 (05 Feb 2023) New ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '4.2.0' +__version__: str = '4.2.1' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/10fe142be0530a277ec7dacc… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/10fe142be0530a277ec7dacc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: HTTP: Make sure streams are closed only once
by Philipp Hörist (＠lovetox) 18 Mar '23

18 Mar '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 45e30be6 by Philipp Hörist at 2023-03-18T18:03:28+01:00 fix: HTTP: Make sure streams are closed only once Stream.close() can have side effects which lead to the method beeing called twice in the same Mainloop iteration. - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -483,13 +483,24 @@ class HTTPRequest(GObject.GObject): self._cleanup() def _close_all_streams(self) -> None: - if self._input_stream is not None: - if not self._input_stream.is_closed(): - self._input_stream.close(None) + # stream.close() will invoke signals on the Message object + # which in turn can lead to this method called again in the + # same Mainloop iteration. This means is_closed() will not + # return True and we get an GLib.IOError.PENDING error. - if self._output_stream is not None: - if not self._output_stream.is_closed(): - self._output_stream.close(None) + input_stream = self._input_stream + output_stream = self._output_stream + + self._input_stream = None + self._output_stream = None + + if input_stream is not None: + if not input_stream.is_closed(): + input_stream.close(None) + + if output_stream is not None: + if not output_stream.is_closed(): + output_stream.close(None) def _cleanup(self) -> None: self._log.info('Run cleanup') @@ -501,9 +512,6 @@ class HTTPRequest(GObject.GObject): del self._session del self._user_data - self._input_stream = None - self._output_stream = None - if self._timeout_id is not None: GLib.source_remove(self._timeout_id) self._timeout_id = None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/45e30be68e80fa21d870d56a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/45e30be68e80fa21d870d56a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-improvements] 2 commits: imprv: Restore chats when enabling account
by Daniel Brötzmann (＠wurstsalat) 18 Mar '23

18 Mar '23

Daniel Brötzmann pushed to branch workspace-improvements at gajim / gajim Commits: e8e3fad4 by wurstsalat at 2023-03-18T12:02:35+01:00 imprv: Restore chats when enabling account This moves settings formerly stored in workspace settings to contact's and group chat contact's settings respectively. New contact settings: 'opened', 'pinned', 'position' Fixes #10872 - - - - - 317a22da by wurstsalat at 2023-03-18T12:02:39+01:00 other: Add settings migration for workspace settings - - - - - 7 changed files: - gajim/common/modules/contacts.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -42,6 +42,7 @@ from gajim.common.modules.util import LogAdapter from gajim.common.setting_values import BoolContactSettings from gajim.common.setting_values import BoolGroupChatSettings +from gajim.common.setting_values import IntContactSettings from gajim.common.setting_values import IntGroupChatSettings from gajim.common.setting_values import StringContactSettings from gajim.common.setting_values import StringGroupChatSettings @@ -60,6 +61,8 @@ def __init__(self, account: str, jid: JID) -> None: def get(self, setting: StringContactSettings) -> str: ... # noqa: E704 @overload def get(self, setting: BoolContactSettings) -> bool: ... # noqa: E704 + @overload + def get(self, setting: IntContactSettings) -> int: ... # noqa: E704 def get(self, setting: Any) -> Any: return app.settings.get_contact_setting( @@ -69,6 +72,8 @@ def get(self, setting: Any) -> Any: def set(self, setting: StringContactSettings, value: str) -> None: ... # noqa: E501, E704 @overload def set(self, setting: BoolContactSettings, value: bool) -> None: ... # noqa: E501, E704 + @overload + def set(self, setting: IntContactSettings, value: int) -> None: ... # noqa: E501, E704 def set(self, setting: Any, value: Any) -> None: app.settings.set_contact_setting( ===================================== gajim/common/setting_values.py ===================================== @@ -368,6 +368,8 @@ class _ACCOUNTDEFAULT: BoolGroupChatSettings = Literal[ 'notify_on_all_messages', + 'opened', + 'pinned', 'print_join_left', 'print_status', 'send_marker', @@ -381,6 +383,7 @@ class _ACCOUNTDEFAULT: ] IntGroupChatSettings = Literal[ + 'position', 'sync_threshold', ] @@ -393,9 +396,15 @@ class _ACCOUNTDEFAULT: BoolContactSettings = Literal[ + 'opened', + 'pinned', 'send_marker', ] +IntContactSettings = Literal[ + 'position', +] + StringContactSettings = Literal[ 'encryption', 'speller_language', @@ -404,9 +413,10 @@ class _ACCOUNTDEFAULT: ] AllContactSettings = Literal[BoolContactSettings, + IntContactSettings, StringContactSettings] -AllContactSettingsT = Union[str, bool] +AllContactSettingsT = Union[str, int, bool] ACCOUNT_SETTINGS = { @@ -484,6 +494,9 @@ class _ACCOUNTDEFAULT: 'send_marker': HAS_ACCOUNT_DEFAULT, 'speller_language': '', 'workspace': '', + 'opened': False, + 'pinned': False, + 'position': -1, }, 'group_chat': { @@ -496,6 +509,9 @@ class _ACCOUNTDEFAULT: 'speller_language': '', 'sync_threshold': HAS_APP_DEFAULT, 'workspace': '', + 'opened': False, + 'pinned': False, + 'position': -1, }, } ===================================== gajim/common/settings.py ===================================== @@ -15,6 +15,7 @@ from typing import Any from typing import Callable from typing import cast +from typing import Generator from typing import Literal from typing import NamedTuple from typing import Optional @@ -58,6 +59,7 @@ from gajim.common.setting_values import HAS_APP_DEFAULT from gajim.common.setting_values import INITAL_WORKSPACE from gajim.common.setting_values import IntAccountSettings +from gajim.common.setting_values import IntContactSettings from gajim.common.setting_values import IntGroupChatSettings from gajim.common.setting_values import IntSettings from gajim.common.setting_values import OpenChatsSettingT @@ -75,6 +77,7 @@ from gajim.common.setting_values import WorkspaceSettings from gajim.common.storage.base import Encoder from gajim.common.storage.base import json_decoder +from gajim.common.types import ChatContactT SETTING_TYPE = Union[bool, int, str, object] @@ -390,6 +393,61 @@ def _migrate(self) -> None: self._settings['app'].pop('muclumbus_api_http_uri', None) self._set_user_version(5) + if version < 6: + # Migrate workspace chats to contact/group chat contact settings + for workspace_id, settings in self._settings['workspaces'].items(): + workspace_settings = cast( + OpenChatsSettingT, settings.get('chats', [])) + for chat in workspace_settings: + if chat['type'] in ('contact', 'pm'): + self.set_contact_setting( + chat['account'], + chat['jid'], + 'workspace', + workspace_id) + self.set_contact_setting( + chat['account'], + chat['jid'], + 'opened', + True) + if chat['pinned']: + self.set_contact_setting( + chat['account'], + chat['jid'], + 'pinned', + chat['pinned']) + if chat['position'] != -1: + self.set_contact_setting( + chat['account'], + chat['jid'], + 'position', + chat['position']) + elif chat['type'] == 'groupchat': + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'workspace', + workspace_id) + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'opened', + True) + if chat['pinned']: + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'pinned', + chat['pinned']) + if chat['position'] != -1: + self.set_group_chat_setting( + chat['account'], + chat['jid'], + 'position', + chat['position']) + + self._set_user_version(6) + def _migrate_old_config(self) -> None: if self._in_memory: return @@ -1024,6 +1082,14 @@ def get_contact_setting(self, ) -> bool: ... + @overload + def get_contact_setting(self, + account: str, + jid: JID, + setting: IntContactSettings + ) -> int: + ... + @overload def get_contact_setting(self, account: str, @@ -1064,6 +1130,14 @@ def set_contact_setting(self, value: str) -> None: ... + @overload + def set_contact_setting(self, + account: str, + jid: JID, + setting: IntContactSettings, + value: int) -> None: + ... + @overload def set_contact_setting(self, account: str, @@ -1124,6 +1198,19 @@ def set_contact_settings(self, for jid in acc_settings['contact']: self.set_contact_setting(account, jid, setting, value) + def iter_contact_settings(self, + account: str + ) -> Generator[ChatContactT, None, None]: + + client = app.get_client(account) + chats = self._account_settings[account]['contact'] + for address in chats: + yield client.get_module('Contacts').get_contact(address) + group_chats = self._account_settings[account]['group_chat'] + for address in group_chats: + yield client.get_module('Contacts').get_contact( + address, groupchat=True) + def set_soundevent_setting(self, event_name: str, setting: str, ===================================== gajim/gtk/chat_list.py ===================================== @@ -24,7 +24,6 @@ from gi.repository import Gdk from gi.repository import GLib -from gi.repository import GObject from gi.repository import Gtk from nbxmpp import JID @@ -49,13 +48,6 @@ class ChatList(Gtk.ListBox, EventHelper): - - __gsignals__ = { - 'chat-order-changed': (GObject.SignalFlags.RUN_LAST, - None, - ()), - } - def __init__(self, workspace_id: str) -> None: Gtk.ListBox.__init__(self) EventHelper.__init__(self) @@ -168,12 +160,20 @@ def mark_as_read(self, account: str, jid: JID) -> None: def toggle_chat_pinned(self, account: str, jid: JID) -> None: row = self._chats[(account, jid)] + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + if row.is_pinned: self._chat_order.remove(row) - row.position = -1 + contact.settings.set('pinned', False) + new_position = -1 else: self._chat_order.append(row) - row.position = self._chat_order.index(row) + contact.settings.set('pinned', True) + new_position = self._chat_order.index(row) + + row.position = new_position + contact.settings.set('position', new_position) row.toggle_pinned() self.invalidate_sort() @@ -283,7 +283,8 @@ def get_chat_list_rows(self) -> list[ChatListRow]: def remove_chat(self, account: str, jid: JID, - emit_unread: bool = True + emit_unread: bool = True, + store: bool = True ) -> None: row = self._chats.pop((account, jid)) @@ -291,6 +292,10 @@ def remove_chat(self, self._chat_order.remove(row) self.remove(row) row.destroy() + + if store: + app.settings.set_contact_setting(account, jid, 'opened', False) + if emit_unread: self._emit_unread_changed() @@ -298,7 +303,7 @@ def remove_chats_for_account(self, account: str) -> None: for row_account, jid in list(self._chats.keys()): if row_account != account: continue - self.remove_chat(account, jid) + self.remove_chat(account, jid, store=False) self._emit_unread_changed() def contains_chat(self, account: str, jid: JID) -> bool: @@ -431,9 +436,10 @@ def _change_pinned_order(self, row_before: Optional[ChatListRow]) -> None: row_before.position + offset, self._drag_row) for row in self._chat_order: - row.position = self._chat_order.index(row) + new_position = self._chat_order.index(row) + row.position = new_position + row.contact.settings.set('position', new_position) - self.emit('chat-order-changed') self.invalidate_sort() def _update_time(self) -> bool: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -148,7 +148,6 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: def add_chat_list(self, workspace_id: str) -> ChatList: chat_list = ChatList(workspace_id) chat_list.connect('row-selected', self._on_row_selected) - chat_list.connect('chat-order-changed', self._on_chat_order_changed) self._chat_lists[workspace_id] = chat_list self.add_named(chat_list, workspace_id) @@ -175,12 +174,6 @@ def _on_row_selected(self, self.emit('chat-selected', row.workspace_id, row.account, row.jid) - def _on_chat_order_changed(self, - chat_list: ChatList - ) -> None: - - self.store_open_chats(chat_list.workspace_id) - def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() if cur_workspace_id != 'default' and cur_workspace_id is not None: @@ -210,17 +203,6 @@ def select_chat(self, account: str, jid: JID) -> None: self.show_chat_list(chat_list.workspace_id) chat_list.select_chat(account, jid) - def store_open_chats(self, workspace_id: str) -> None: - chat_list = self._chat_lists[workspace_id] - open_chats = chat_list.get_open_chats() - for chat in open_chats: - client = app.get_client(chat['account']) - contact = client.get_module('Contacts').get_contact(chat['jid']) - contact.settings.set('workspace', workspace_id) - - app.settings.set_workspace_setting( - workspace_id, 'chats', open_chats) - @structs.actionmethod def _toggle_chat_pinned(self, _action: Gio.SimpleAction, @@ -229,7 +211,6 @@ def _toggle_chat_pinned(self, chat_list = self._chat_lists[params.workspace_id] chat_list.toggle_chat_pinned(params.account, params.jid) - self.store_open_chats(params.workspace_id) @structs.actionmethod def _move_chat_to_workspace(self, @@ -246,13 +227,15 @@ def _move_chat_to_workspace(self, if type_ is None: return - source_chatlist.remove_chat(params.account, params.jid) + source_chatlist.remove_chat(params.account, params.jid, store=False) new_chatlist = self.get_chatlist(workspace_id) new_chatlist.add_chat(params.account, params.jid, type_, False, -1) - self.store_open_chats(source_chatlist.workspace_id) - self.store_open_chats(workspace_id) + client = app.get_client(params.account) + contact = client.get_module('Contacts').get_contact(params.jid) + contact.settings.set('workspace', workspace_id) + contact.settings.set('pinned', False) @structs.actionmethod def _mark_as_read(self, @@ -265,6 +248,7 @@ def _mark_as_read(self, def remove_chat(self, workspace_id: str, account: str, jid: JID) -> None: chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) + client = app.get_client(account) def _leave(not_ask_again: bool) -> None: if not_ask_again: @@ -273,14 +257,14 @@ def _leave(not_ask_again: bool) -> None: def _remove() -> None: chat_list.remove_chat(account, jid, emit_unread=False) - self.store_open_chats(workspace_id) + contact = client.get_module('Contacts').get_contact(jid) + contact.settings.set('opened', False) self.emit('chat-removed', account, jid, type_) if type_ != 'groupchat' or not app.settings.get('confirm_close_muc'): _remove() return - client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid, groupchat=True) if contact.is_not_joined: @@ -300,9 +284,8 @@ def _remove() -> None: transient_for=app.window).show() def remove_chats_for_account(self, account: str) -> None: - for workspace_id, chat_list in self._chat_lists.items(): + for chat_list in self._chat_lists.values(): chat_list.remove_chats_for_account(account) - self.store_open_chats(workspace_id) def find_chat(self, account: str, jid: JID) -> Optional[ChatList]: for chat_list in self._chat_lists.values(): ===================================== gajim/gtk/chat_page.py ===================================== @@ -247,27 +247,31 @@ def add_chat_for_workspace(self, if self._startup_finished: if select: self._chat_list_stack.select_chat(account, jid) - self._chat_list_stack.store_open_chats(workspace_id) + + contact = client.get_module('Contacts').get_contact(jid) + contact.settings.set('opened', True) + if message is not None: message_input = self._chat_stack.get_message_input() message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: - open_chats = app.settings.get_workspace_setting(workspace_id, - 'chats') - active_accounts = app.settings.get_active_accounts() - for open_chat in open_chats: - account = open_chat['account'] - if account not in active_accounts: - continue - - self.add_chat_for_workspace(workspace_id, - account, - open_chat['jid'], - open_chat['type'], - pinned=open_chat['pinned'], - position=open_chat['position']) + for account in active_accounts: + for contact in app.settings.iter_contact_settings(account): + if not contact.settings.get('workspace') == workspace_id: + continue + + if not contact.settings.get('opened'): + continue + + self.add_chat_for_workspace( + workspace_id, + account, + contact.jid, + contact.type_string, + pinned=contact.settings.get('pinned'), + position=contact.settings.get('position')) def is_chat_selected(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_selected(account, jid) ===================================== gajim/gtk/main.py ===================================== @@ -239,6 +239,9 @@ def _on_account_enabled(self, event: events.AccountEnabled) -> None: client = app.get_client(event.account) client.connect_signal('state-changed', self._on_client_state_changed) + for workspace_id in app.settings.get_workspaces(): + self._chat_page.load_workspace_chats(workspace_id) + def _on_account_disabled(self, event: events.AccountDisabled) -> None: workspace_id = self._workspace_side_bar.get_first_workspace() self.activate_workspace(workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74e5db49e9bc887de54b536f1fee3b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/74e5db49e9bc887de54b536f1fee3b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-improvements] 17 commits: fix: Notifications: Honor notification_preview_message setting
by Daniel Brötzmann (＠wurstsalat) 17 Mar '23

17 Mar '23

Daniel Brötzmann pushed to branch workspace-improvements at gajim / gajim Commits: 0b0f9ba9 by wurstsalat at 2023-03-02T09:25:03+01:00 fix: Notifications: Honor notification_preview_message setting - - - - - 535f7b44 by Daniel Brötzmann at 2023-03-02T09:21:55+00:00 imprv: Windows installer: Add Polish language - - - - - 79923364 by wurstsalat at 2023-03-03T09:30:13+01:00 cfix: Windows installer: Save files using UTF-8 with BOM, convert intendation to spaces - - - - - bda77f26 by Michel Le Bihan at 2023-03-05T16:57:08+00:00 imprv: Declare that the installer is DPI-aware - - - - - bc14c535 by wurstsalat at 2023-03-09T18:59:28+00:00 fix: Don't fail if contact name for MUC message is None Fixes #11417 - - - - - 526782cc by wurstsalat at 2023-03-09T19:07:36+00:00 fix: Show chat notifications when chat page is not visible Fixes #11416 - - - - - 73e3ee88 by mesonium at 2023-03-09T15:03:07-05:00 cfix: Update links to GNOME Gtk and GLib repo - - - - - 67443ab9 by Nicoco at 2023-03-11T18:33:40+00:00 fix: Chatstates: Remove composing timeout correctly - - - - - f9058e21 by Philipp Hörist at 2023-03-11T19:48:30+01:00 fix: HTTPUpload: Respect infinite file size limit Fixes #11436 - - - - - 44cbd2ff by Philipp Hörist at 2023-03-11T19:55:05+01:00 fix: Migration: Don’t fail on color setting migration Fixes #11426 - - - - - 7d8e24a6 by Weblate at 2023-03-11T20:25:41+01:00 chore: Update translations - - - - - 2b0a1423 by Philipp Hörist at 2023-03-11T20:29:35+01:00 release: 1.7.2 - - - - - ab6c80fe by Philipp Hörist at 2023-03-12T12:48:03+01:00 other: Update release issue template - - - - - d3fee1d9 by Philipp Hörist at 2023-03-14T23:18:33+01:00 cq: Improve various type annotations - - - - - 4bbebc37 by wurstsalat at 2023-03-17T23:54:21+01:00 imprv: Store workspace when closing chat Fixes #11374 - - - - - 5f475f9d by wurstsalat at 2023-03-17T23:54:49+01:00 imprv: Restore chats when enabling account This moves settings formerly stored in workspace settings to contact's and group chat contact's settings respectively. New contact settings: 'opened', 'pinned', 'position' Fixes #10872 - - - - - 74e5db49 by wurstsalat at 2023-03-17T23:54:51+01:00 other: Add settings migration for workspace settings - - - - - 30 changed files: - .gitlab/issue_templates/Release.md - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/optparser.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/gtk/accounts.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/dialogs.py - gajim/gtk/file_transfer_selector.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gtk/pep_config.py - gajim/gtk/proxies.py - gajim/gtk/xml_console.py - gajim/plugins/helpers.py - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34d72ca1a9642f594a995921027ec0e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/34d72ca1a9642f594a995921027ec0e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Improve various type annotations
by Philipp Hörist (＠lovetox) 14 Mar '23

14 Mar '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: d3fee1d9 by Philipp Hörist at 2023-03-14T23:18:33+01:00 cq: Improve various type annotations - - - - - 7 changed files: - gajim/gtk/accounts.py - gajim/gtk/dialogs.py - gajim/gtk/main_stack.py - gajim/gtk/pep_config.py - gajim/gtk/proxies.py - gajim/gtk/xml_console.py - gajim/plugins/helpers.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -267,6 +267,7 @@ def remove_account(self, row: AccountRow) -> None: back_row.emit('activate') self._accounts_listbox.remove(row) sub_menu = self._stack.get_child_by_name(f'{row.account}-menu') + assert sub_menu is not None self._stack.remove(sub_menu) row.destroy() sub_menu.destroy() ===================================== gajim/gtk/dialogs.py ===================================== @@ -230,6 +230,7 @@ def __init__(self, self._checkbutton.set_margin_start(30) self._checkbutton.set_margin_end(30) label = self._checkbutton.get_child() + assert isinstance(label, Gtk.Label) label.set_line_wrap(True) label.set_max_width_chars(50) label.set_halign(Gtk.Align.START) ===================================== gajim/gtk/main_stack.py ===================================== @@ -52,6 +52,7 @@ def add_account_page(self, account: str) -> None: def remove_account_page(self, account: str) -> None: account_page = self.get_child_by_name(account) + assert account_page is not None account_page.destroy() def remove_chats_for_account(self, account: str) -> None: ===================================== gajim/gtk/pep_config.py ===================================== @@ -117,7 +117,7 @@ def _init_services(self): self.treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING) self._ui.services_treeview.set_model(self.treestore) - col = Gtk.TreeViewColumn(_('Service')) + col = Gtk.TreeViewColumn(title=_('Service')) col.set_sort_column_id(0) self._ui.services_treeview.append_column(col) ===================================== gajim/gtk/proxies.py ===================================== @@ -83,7 +83,7 @@ def _init_list(self) -> None: self._ui.settings_grid.set_sensitive(False) model = Gtk.ListStore(str) self._ui.proxies_treeview.set_model(model) - col = Gtk.TreeViewColumn('Proxies') + col = Gtk.TreeViewColumn(title='Proxies') self._ui.proxies_treeview.append_column(col) renderer = Gtk.CellRendererText() col.pack_start(renderer, True) ===================================== gajim/gtk/xml_console.py ===================================== @@ -189,7 +189,9 @@ def _on_row_activated(self, _listbox: Gtk.ListBox, row: Gtk.ListBoxRow ) -> None: - text = row.get_child().get_text() + child = row.get_child() + assert isinstance(child, Gtk.Label) + text = child.get_text() # pylint: disable=line-too-long input_text = None ===================================== gajim/plugins/helpers.py ===================================== @@ -31,8 +31,8 @@ class GajimPluginActivateException(Exception): def get_builder(file_name: str, widgets: Optional[list[str]] = None) -> Builder: - return Builder(file_name, # pyright: ignore - widgets, + return Builder(file_name, + widgets, # pyright: ignore domain=DOMAIN, gettext_=_) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3fee1d9e52abe8fae77455485dbdaa5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d3fee1d9e52abe8fae77455485dbdaa5… 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 March 2023