Commits February 2023

commits@gajim.org

1 participants
41 discussions

[Git][gajim/gajim] Pushed new branch workspace-improvements
by Daniel Brötzmann (＠wurstsalat) 27 Feb '23

27 Feb '23

Daniel Brötzmann pushed new branch workspace-improvements at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/workspace-improvements You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix nickname highlight in group chats
by Daniel Brötzmann (＠wurstsalat) 24 Feb '23

24 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8c1cfd90 by wurstsalat at 2023-02-24T10:12:12+01:00 fix: Fix nickname highlight in group chats Fixes #11413 - - - - - 2 changed files: - gajim/common/helpers.py - test/common/test_message_needs_highlight.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -584,8 +584,9 @@ def message_needs_highlight(text: str, nickname: str, own_jid: str) -> bool: return True char_before_allowed = bool( - not text[match - 1].isalpha() and - text[match - 1] not in ('/', '-')) + match == 0 or + (not text[match - 1].isalpha() and + text[match - 1] not in ('/', '-'))) if char_before_allowed and search_end == len(text): # search_string found at the end of text and ===================================== test/common/test_message_needs_highlight.py ===================================== @@ -21,12 +21,19 @@ def test_highlight(self): t_text7 = 'Did you test this?' t_text8 = 'Hi romeo' t_text9 = 'My address is juliet@xmppserver' - - f_text1 = 'RomeoDoes this work?' - f_text2 = '' - f_text3 = 'https://romeo.tld' - f_text4 = 'https://romeo.tld message' - f_text5 = 'https://test.tld/where-is-romeo' + t_text10 = 'Romeo, asd' + t_text11 = 'Romeo,' + t_text12 = 'Romeo,hi' + t_text13 = '@Romeo' + t_text14 = '#Romeo' + + f_text1 = '' + f_text2 = 'RomeoDoes this work?' + f_text3 = 'nRomeo' + f_text4 = 'nRomeoa' + f_text_url_1 = 'https://romeo.tld' + f_text_url_2 = 'https://romeo.tld message' + f_text_url_3 = 'https://test.tld/where-is-romeo' self.assertTrue(message_needs_highlight(t_text1, NICK, JID)) self.assertTrue(message_needs_highlight(t_text2, NICK, JID)) @@ -37,9 +44,16 @@ def test_highlight(self): self.assertTrue(message_needs_highlight(t_text7, NICK, JID)) self.assertTrue(message_needs_highlight(t_text8, NICK, JID)) self.assertTrue(message_needs_highlight(t_text9, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text10, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text11, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text12, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text13, NICK, JID)) + self.assertTrue(message_needs_highlight(t_text14, NICK, JID)) self.assertFalse(message_needs_highlight(f_text1, NICK, JID)) self.assertFalse(message_needs_highlight(f_text2, NICK, JID)) self.assertFalse(message_needs_highlight(f_text3, NICK, JID)) self.assertFalse(message_needs_highlight(f_text4, NICK, JID)) - self.assertFalse(message_needs_highlight(f_text5, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text_url_1, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text_url_2, NICK, JID)) + self.assertFalse(message_needs_highlight(f_text_url_3, NICK, JID)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c1cfd90f37503b3f3fe6125a984448b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c1cfd90f37503b3f3fe6125a984448b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 80 commits: ci: Debian: Fix debian package build
by Daniel Brötzmann (＠wurstsalat) 22 Feb '23

22 Feb '23

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 10348486 by Philipp Hörist at 2023-01-30T21:41:24+01:00 ci: Debian: Fix debian package build Use python3:Depends to gather dependencies Fixes #11386 - - - - - 2163b33f by Philipp Hörist at 2023-01-31T19:34:02+01:00 ci: Add Debian only pipelines - - - - - 614b5a9e by Philipp Hörist at 2023-01-31T20:00:03+01:00 ci: Don’t include revision in folder name - - - - - 2b64acbf by Philipp Hörist at 2023-01-31T22:05:45+01:00 ci: Build nightly only if necessary - - - - - 55dfb403 by Philipp Hörist at 2023-02-01T20:12:17+01:00 ci: Remove obsolete script - - - - - ee774b29 by Weblate at 2023-02-01T20:18:15+01:00 chore: Update translations - - - - - 27f65cf6 by Philipp Hörist at 2023-02-01T21:46:09+01:00 ci: Fix linter version - - - - - b5d9231e by Philipp Hörist at 2023-02-03T00:34:01+01:00 refactor: Fix unnecessary comparisons - - - - - c1a77f45 by Philipp Hörist at 2023-02-03T00:40:38+01:00 chore: Update IANA data - - - - - a95e6966 by Philipp Hörist at 2023-02-03T00:44:55+01:00 release: 1.7.0 - - - - - 3c2c6448 by Philipp Hörist at 2023-02-03T15:47:25+01:00 fix: Make switching status work again This was a regression after refactoring - - - - - 6aa2a6d4 by Philipp Hörist at 2023-02-05T17:44:54+01:00 change: Raise nbxmpp version to 4.2.0 - - - - - 97679843 by Philipp Hörist at 2023-02-05T17:44:54+01:00 fix: Apply SASLprep to passwords This fixes the case where it was not possible to login with Gajim when some special characters where used in the password - - - - - e837ef4e by Philipp Hörist at 2023-02-05T20:34:25+01:00 feat: Improve KeepassXC Integration Provide setting which improves the KeepassXC Integration NOTES: If you already used KeepassXC with Gajim, enabling the new integration setting will trigger new entries in the password manager - - - - - 42df93c3 by Philipp Hörist at 2023-02-05T21:42:26+01:00 refactor: Add MemoryPasswordStorage This helps to provide a uniform interface for setting and getting passwords - - - - - b8bbae6e by Philipp Hörist at 2023-02-06T21:38:06+01:00 imprv: MUC: Enable archiving when creating MUCs on ejabberd - - - - - 0e9d53f4 by Weblate at 2023-02-08T21:57:53+01:00 chore: Update translations - - - - - 1afc701c by Philipp Hörist at 2023-02-08T22:08:41+01:00 other: Flatpak: Update dependencies - - - - - a600ca70 by Philipp Hörist at 2023-02-08T22:09:28+01:00 release: 1.7.1 - - - - - 23ba79a3 by wurstsalat at 2023-02-10T20:46:08+01:00 fix: Start Chat: Fix wrong JID type in _start_new_chat Fixes #11398 - - - - - e2569508 by wurstsalat at 2023-02-10T20:50:25+01:00 fix: Plugins: Don't fail hard on uninstall errors Fixes #11389 - - - - - 45f2388f by wurstsalat at 2023-02-10T21:08:18+01:00 fix: Nickname completion: Make sure recent nicknames list does not contain None Fixes #11394 - - - - - f5635b84 by wurstsalat at 2023-02-10T21:53:50+01:00 imprv: Audio preview: Allow skipping by clicking the visualization Closes #11392 - - - - - 799b8c21 by wurstsalat at 2023-02-11T18:58:59+01:00 fix: Don't highlight message if it's an URI containing our nick Fixes #11387 - - - - - 63a0e85b by Philipp Hörist at 2023-02-13T19:59:30+01:00 imprv: Add audio/x-wav to default mime types - - - - - 94e227f0 by wurstsalat at 2023-02-14T21:45:26+01:00 fix: GetRelativeTimeTest: Fix comparison of translated strings and off-by timezone errors - - - - - 0618ab18 by wurstsalat at 2023-02-14T21:45:26+01:00 cfix: Settings values: Make additional_uri_schemes a string setting - - - - - 1526a6db by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Tests: Use in-memory settings database - - - - - c1225720 by wurstsalat at 2023-02-14T21:45:26+01:00 imprv: Improve check for message highlight and add tests - - - - - e57e7b5c by wurstsalat at 2023-02-14T21:59:07+01:00 imprv: Improve get_recent_muc_nicks query - - - - - ff12e81a by wurstsalat at 2023-02-15T20:23:17+01:00 fix: Profile: Don't allow saving profile when not connected Fixes #11401 - - - - - b5a3c285 by wurstsalat at 2023-02-15T20:48:13+01:00 cq: Use correct data type for ngettext - - - - - 9d7c788a by wurstsalat at 2023-02-15T21:01:19+01:00 cq: Text styling: Add type hint - - - - - 951a7a1e by wurstsalat at 2023-02-15T21:02:18+01:00 ci: Update pyright config - - - - - 677244fd by wurstsalat at 2023-02-17T14:20:48+01:00 imprv: PEPConfig: Ask for confirmation when deleting nodes - - - - - 64719feb by Daniel Brötzmann at 2023-02-17T13:27:19+00:00 cfix: HighlightTest: Fix xmpp address test - - - - - 9ae5487e by Philipp Hörist at 2023-02-19T10:47:19+01:00 imprv: Don’t color log timestamps - - - - - 2959a47d by Philipp Hörist at 2023-02-19T10:47:19+01:00 refactor: Simplify action lookup - - - - - 1b993e59 by Philipp Hörist at 2023-02-19T10:47:20+01:00 refactor: Remove unnecessary None check - - - - - ca959adb by Philipp Hörist at 2023-02-19T10:47:20+01:00 cq: Narrow expected type - - - - - a29845d7 by wurstsalat at 2023-02-19T16:43:00+01:00 imprv: Select group chat after creating it Fixes #11304 - - - - - 508b0523 by wurstsalat at 2023-02-19T22:34:17+01:00 cfix: Improve get_recent_muc_nicks query - - - - - 1e165ac4 by wurstsalat at 2023-02-20T10:48:13+01:00 other: Windows installer: Remove 'Run application' checkbox on finish page Running Gajim after the setup (which is using elevated privileges) will run gajim.exe in the same context. This may lead to problems, since Gajim should not be run with elevated privileges. Running with user privileges can not be easily achieved using NSIS. Therefore, running the application after the setup has been disabled. - - - - - 7aef2aa6 by wurstsalat at 2023-02-20T18:27:38+01:00 imprv: Windows: Offer direct download of Gajim setup when update is available - - - - - a39f0a1b by wurstsalat at 2023-02-20T20:09:19+01:00 imprv: Windows: Add direct download for Gajim Portable updates - - - - - aa5cb0a9 by wurstsalat at 2023-02-20T19:55:08+00:00 imprv: Proxies: Add 'Tor (Browser)' default proxy setting - - - - - 08f9b39a by wurstsalat at 2023-02-21T20:28:27+01:00 imprv: Add message menu entry for deleting messages locally - - - - - faac4f25 by lovetox at 2023-02-22T19:20:02+01:00 Omemo Start - - - - - 4be05807 by wurstsalat at 2023-02-22T19:20:02+01:00 cq: OMEMO: Add type annotations - - - - - 2dff4c97 by wurstsalat at 2023-02-22T19:20:02+01:00 cq: OMEMO: Fix linting errors - - - - - 79c8c857 by wurstsalat at 2023-02-22T19:20:02+01:00 cq: Add type stubs for python-qrcode - - - - - 68d8b855 by wurstsalat at 2023-02-22T19:20:02+01:00 chore: Adapt dependencies for OMEMO - - - - - 0b9651a2 by wurstsalat at 2023-02-22T19:20:02+01:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - e0d82e52 by wurstsalat at 2023-02-22T19:20:02+01:00 new: Add OMEMO_TEMP_DL to caps - - - - - 5ba3500f by wurstsalat at 2023-02-22T19:20:02+01:00 new: Add OMEMOTrustManager - - - - - be842f02 by wurstsalat at 2023-02-22T19:20:02+01:00 new: OMEMO: Add file encryption - - - - - b344ea25 by Philipp Hörist at 2023-02-22T19:20:33+01:00 chore: Update dependencies - - - - - a7a19bf0 by Philipp Hörist at 2023-02-22T19:20:34+01:00 new: Block omemo plugin - - - - - c70728d2 by wurstsalat at 2023-02-22T19:20:34+01:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 6991b03d by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Move omemo storage to storage module - - - - - 50836030 by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Move omemo code into common - - - - - a56a8a64 by Philipp Hörist at 2023-02-22T19:20:34+01:00 cq: Fix linter errors - - - - - 79e137d6 by wurstsalat at 2023-02-22T19:20:34+01:00 new: OMEMO: Add handling of MucAdded signal - - - - - 5f1d49ca by wurstsalat at 2023-02-22T19:20:34+01:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 6fa8481d by Philipp Hörist at 2023-02-22T19:20:34+01:00 fix: check preconditions - - - - - bd106e7a by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Rename methods - - - - - 9740f439 by Philipp Hörist at 2023-02-22T19:20:34+01:00 cq: Remove blank line - - - - - 9a50c1ca by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Remove unused code - - - - - 73849097 by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Use send_stanza method - - - - - ab6e16f6 by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Remove devices module - - - - - 6794616a by Philipp Hörist at 2023-02-22T19:20:34+01:00 cq: Remove unused imports - - - - - 9c9e680f by Philipp Hörist at 2023-02-22T19:20:34+01:00 refactor: Switch to new library - - - - - b13d4456 by Philipp Hörist at 2023-02-22T19:20:34+01:00 cq: Fix storage annotations - - - - - 6aeda075 by Philipp Hörist at 2023-02-22T19:20:34+01:00 fix: Fix import - - - - - 5110fb56 by wurstsalat at 2023-02-22T19:32:20+01:00 Fix typo in flatpak files - - - - - 1bedeabb by wurstsalat at 2023-02-22T19:32:28+01:00 Enable users to copy their fingerprints - - - - - 914effa6 by wurstsalat at 2023-02-22T19:33:39+01:00 Fix HTTPUpload method call - - - - - bf1cb181 by wurstsalat at 2023-02-22T20:57:34+01:00 OMEMOTrustManager: Fix leaks - - - - - 057d08e7 by wurstsalat at 2023-02-22T20:59:36+01:00 Run isort - - - - - 0b9ae2d7 by wurstsalat at 2023-02-22T21:15:52+01:00 cq: Fix linting errors - - - - - 30 changed files: - − .ci/make_release.py - .gitlab-ci.yml - .pre-commit-config.yaml - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - debian/control - + debian/patches/remove-nbxmpp-from-deps.patch - + debian/patches/series - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/client.py - gajim/common/const.py - gajim/common/dbus/logind.py - gajim/common/dbus/music_track.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/filetransfer.py - gajim/common/helpers.py - gajim/common/iana.py - gajim/common/logging_helpers.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/26df9e5ded7149d721019ca09a7f0a5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/26df9e5ded7149d721019ca09a7f0a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Add message menu entry for deleting messages locally
by Daniel Brötzmann (＠wurstsalat) 21 Feb '23

21 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 08f9b39a by wurstsalat at 2023-02-21T20:28:27+01:00 imprv: Add message menu entry for deleting messages locally - - - - - 6 changed files: - gajim/common/storage/archive.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/menus.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -1197,6 +1197,19 @@ def insert_into_logs(self, return lastrowid + @timeit + def delete_message_from_logs(self, log_line_id: int) -> None: + ''' + Delete a message from the `logs` table + + :param log_line_id: The message's log_line_id + ''' + sql = 'DELETE FROM logs WHERE log_line_id = ?' + self._con.execute(sql, (log_line_id, )) + + self._delayed_commit() + log.info('Deleted message with log_line_id %s', log_line_id) + @timeit def set_message_error(self, account_jid: str, ===================================== gajim/gtk/const.py ===================================== @@ -194,6 +194,7 @@ def __str__(self): ('input-clear', None, True), ('show-emoji-chooser', None, True), ('activate-message-selection', 'u', True), + ('delete-message-locally', 'u', True), ('correct-message', None, False), ('copy-message', 's', True), ('retract-message', 'a{sv}', False), ===================================== gajim/gtk/control.py ===================================== @@ -570,6 +570,9 @@ def _add_message(self, else: self._jump_to_end_button.add_unread_count() + def remove_message(self, log_line_id: int) -> None: + self._scrolled_view.remove_message(log_line_id) + def reset_view(self) -> None: self._scrolled_view.reset() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -664,6 +664,11 @@ def _reduce_messages_after(self) -> None: row = self._get_row_at_index(len(self._list_box.get_children()) - 1) row.destroy() + def remove_message(self, log_line_id: int) -> None: + row = self.get_row_by_log_line_id(log_line_id) + if row is not None: + row.destroy() + def scroll_to_message_and_highlight(self, log_line_id: int) -> None: highlight_row = None for row in cast(list[BaseRow], self._list_box.get_children()): ===================================== gajim/gtk/main.py ===================================== @@ -424,6 +424,7 @@ def _connect_actions(self) -> None: ('preview-open-link', self._on_preview_action), ('copy-message', self._on_copy_message), ('retract-message', self._on_retract_message), + ('delete-message-locally', self._on_delete_message_locally), ('add-workspace', self._add_workspace), ('edit-workspace', self._edit_workspace), ('remove-workspace', self._remove_workspace), @@ -649,6 +650,26 @@ def _on_retract(reason: str) -> None: input_str=_('Spam'), transient_for=app.window).show() + def _on_delete_message_locally(self, + _action: Gio.SimpleAction, + param: GLib.Variant + ) -> None: + + def _on_delete() -> None: + log_line_id = param.get_uint32() + app.storage.archive.delete_message_from_logs(log_line_id) + control = self.get_control() + control.remove_message(log_line_id) + + ConfirmationDialog( + _('Delete Message'), + _('Delete message locally?'), + _('This message will be deleted from your local chat history'), + [DialogButton.make('Cancel'), + DialogButton.make('Delete', + callback=_on_delete)], + transient_for=app.window).show() + def _on_window_motion_notify(self, _widget: Gtk.ApplicationWindow, _event: Gdk.EventMotion ===================================== gajim/gtk/menus.py ===================================== @@ -726,6 +726,12 @@ def get_chat_row_menu(contact: types.ChatContactT, 'win.retract-message', param)) + if log_line_id is not None: + menu_items.append( + (p_('Message row action', 'Delete Message Locally…'), + 'win.delete-message-locally', + GLib.Variant('u', log_line_id or 0))) + return GajimMenu.from_list(menu_items) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08f9b39aaf96af1fefeebc443de5149b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08f9b39aaf96af1fefeebc443de5149b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch delete-message-locally
by Daniel Brötzmann (＠wurstsalat) 21 Feb '23

21 Feb '23

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

1 0

[Git][gajim/gajim] Pushed new branch delete-message-locally
by Daniel Brötzmann (＠wurstsalat) 21 Feb '23

21 Feb '23

Daniel Brötzmann pushed new branch delete-message-locally at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/delete-message-locally You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Proxies: Add 'Tor (Browser)' default proxy setting
by Philipp Hörist (＠lovetox) 20 Feb '23

20 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: aa5cb0a9 by wurstsalat at 2023-02-20T19:55:08+00:00 imprv: Proxies: Add 'Tor (Browser)' default proxy setting - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -584,6 +584,11 @@ class WorkspaceSettings(TypedDict): 'host': 'localhost', 'port': 9050 }, + 'Tor (Browser)': { + 'type': 'socks5', + 'host': 'localhost', + 'port': 9150 + }, } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5cb0a9098d07d8622751d6eb5d9ce5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa5cb0a9098d07d8622751d6eb5d9ce5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Add direct download for Gajim Portable updates
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a39f0a1b by wurstsalat at 2023-02-20T20:09:19+01:00 imprv: Windows: Add direct download for Gajim Portable updates - - - - - 1 changed file: - gajim/common/application.py Changes: ===================================== gajim/common/application.py ===================================== @@ -33,6 +33,7 @@ from nbxmpp.http import HTTPRequest from packaging.version import Version as V +from gajim import IS_PORTABLE from gajim.common import app from gajim.common import configpaths from gajim.common import ged @@ -324,7 +325,9 @@ def _on_update_response(self, request: HTTPRequest) -> None: data = json.loads(request.get_data()) latest_version = data['current_version'] - setup_url = data['current_setup_url'] + setup_url = data['current_win_setup'] + if IS_PORTABLE: + setup_url = data['current_win_portable_setup'] if V(latest_version) > V(app.version): app.ged.raise_event(GajimUpdateAvailable(version=latest_version, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a39f0a1ba3cf321d616016e4661ce556… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a39f0a1ba3cf321d616016e4661ce556… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Offer direct download of Gajim setup when update is available
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7aef2aa6 by wurstsalat at 2023-02-20T18:27:38+01:00 imprv: Windows: Offer direct download of Gajim setup when update is available - - - - - 5 changed files: - gajim/common/application.py - gajim/common/events.py - gajim/data/gui/app_page.ui - gajim/gtk/app_page.py - gajim/gtk/main.py Changes: ===================================== gajim/common/application.py ===================================== @@ -324,9 +324,11 @@ def _on_update_response(self, request: HTTPRequest) -> None: data = json.loads(request.get_data()) latest_version = data['current_version'] + setup_url = data['current_setup_url'] if V(latest_version) > V(app.version): - app.ged.raise_event(GajimUpdateAvailable(version=latest_version)) + app.ged.raise_event(GajimUpdateAvailable(version=latest_version, + setup_url=setup_url)) return self._log.info('Gajim is up to date') ===================================== gajim/common/events.py ===================================== @@ -681,6 +681,7 @@ class AllowGajimUpdateCheck(ApplicationEvent): class GajimUpdateAvailable(ApplicationEvent): name: str = field(init=False, default='gajim-update-available') version: str + setup_url: str @dataclass ===================================== gajim/data/gui/app_page.ui ===================================== @@ -36,7 +36,7 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="valign">center</property> - <signal name="clicked" handler="_on_visit_website_clicked" swapped="no"/> + <signal name="clicked" handler="_on_download_update_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> ===================================== gajim/gtk/app_page.py ===================================== @@ -18,6 +18,7 @@ from typing import cast from typing import Optional +import sys from datetime import datetime from gi.repository import GObject @@ -76,9 +77,12 @@ def __init__(self) -> None: def add_app_message(self, category: str, - message: Optional[str] + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None ) -> None: - self._app_message_listbox.add_app_message(category, message) + + self._app_message_listbox.add_app_message( + category, new_version, new_setup_url) self._unread_count += 1 self.emit('unread-count-changed', self._unread_count) @@ -111,8 +115,13 @@ def __init__(self) -> None: self.show_all() - def add_app_message(self, category: str, message: Optional[str]) -> None: - row = AppMessageRow(category, message) + def add_app_message(self, + category: str, + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None + ) -> None: + + row = AppMessageRow(category, new_version, new_setup_url) self.add(row) def add_plugin_update_message(self, @@ -157,11 +166,14 @@ def _get_update_text() -> str: class AppMessageRow(Gtk.ListBoxRow): def __init__(self, category: str, - message: Optional[str] = None, + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None, plugin_manifests: Optional[list[PluginManifest]] = None ) -> None: + Gtk.ListBoxRow.__init__(self) self._plugin_manifests = plugin_manifests + self._new_setup_url = new_setup_url self._ui = get_builder('app_page.ui') @@ -170,7 +182,7 @@ def __init__(self, if category == 'gajim-update-available': self.add(self._ui.gajim_update) - text = _('Version %s is available') % message + text = _('Gajim %s is available') % new_version self._ui.update_message.set_text(text) if category == 'plugin-updates': @@ -194,8 +206,12 @@ def _on_dismiss_check_clicked(self, _button: Gtk.Button) -> None: app.settings.set('check_for_update', False) self._remove_app_message() - def _on_visit_website_clicked(self, _button: Gtk.Button) -> None: - open_uri('https://gajim.org/download') + def _on_download_update_clicked(self, _button: Gtk.Button) -> None: + assert self._new_setup_url is not None + if sys.platform == 'win32': + open_uri(self._new_setup_url) + else: + open_uri('https://gajim.org/download/') self._remove_app_message() def _on_dismiss_clicked(self, _button: Gtk.Button) -> None: ===================================== gajim/gtk/main.py ===================================== @@ -262,8 +262,13 @@ def _on_allow_gajim_update(self, self.add_app_message(event.name) def _on_gajim_update_available(self, - event: events.GajimUpdateAvailable) -> None: - self.add_app_message(event.name, event.version) + event: events.GajimUpdateAvailable + ) -> None: + + self.add_app_message( + event.name, + new_version=event.version, + new_setup_url=event.setup_url) @staticmethod def _on_roster_item_exchange(event: events.RosterItemExchangeEvent) -> None: @@ -998,8 +1003,11 @@ def show_app_page(self) -> None: def add_app_message(self, category: str, - message: Optional[str] = None) -> None: - self._app_page.add_app_message(category, message) + new_version: Optional[str] = None, + new_setup_url: Optional[str] = None + ) -> None: + + self._app_page.add_app_message(category, new_version, new_setup_url) def get_control(self) -> ChatControl: return self._chat_page.get_control() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7aef2aa6b8b66a8ad3f2e35fdbe1c8bc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7aef2aa6b8b66a8ad3f2e35fdbe1c8bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Windows installer: Remove 'Run application' checkbox on finish page
by Daniel Brötzmann (＠wurstsalat) 20 Feb '23

20 Feb '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1e165ac4 by wurstsalat at 2023-02-20T10:48:13+01:00 other: Windows installer: Remove 'Run application' checkbox on finish page Running Gajim after the setup (which is using elevated privileges) will run gajim.exe in the same context. This may lead to problems, since Gajim should not be run with elevated privileges. Running with user privileges can not be easily achieved using NSIS. Therefore, running the application after the setup has been disabled. - - - - - 1 changed file: - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim.nsi ===================================== @@ -36,7 +36,6 @@ Var StartMenuFolder !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_WELCOME View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e165ac427ac0a8b2574d951f6ce419c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e165ac427ac0a8b2574d951f6ce419c… 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 February 2023