Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] cfix: Builder: Fix isort error
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 78c8665e by wurstsalat at 2023-01-08T18:23:35+01:00 cfix: Builder: Fix isort error - - - - - 1 changed file: - gajim/gtk/builder.pyi Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -6,7 +6,6 @@ from gi.repository import Atk from gi.repository import Gtk from gi.repository import GtkSource - class Builder(Gtk.Builder): ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c8665eb2f9d49a19b6bd0bb3b7e51e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/78c8665eb2f9d49a19b6bd0bb3b7e51e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: imprv: AccountPage: Make all account menu items available
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dddfbac3 by wurstsalat at 2023-01-08T18:09:18+01:00 imprv: AccountPage: Make all account menu items available Fixes #11329 - - - - - 54d1a70b by wurstsalat at 2023-01-08T18:10:37+01:00 imprv: Account menu: Add Execute Command… entry for convenience - - - - - 4 changed files: - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/builder.pyi - gajim/gtk/menus.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -138,38 +138,11 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkOverlay"> + <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> - <child> - <object class="GtkImage" id="avatar_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">missging-image</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="index">-1</property> - </packing> - </child> - <child type="overlay"> - <object class="GtkButton" id='edit_profile_button'> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Profile…</property> - <property name="halign">end</property> - <property name="valign">start</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> - </object> - </child> - </object> - </child> + <property name="icon-name">missging-image</property> + <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> @@ -178,69 +151,81 @@ </packing> </child> <child> - <object class="GtkLabel" id="account_label"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label"><name></property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="account_action_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Account Settings…</property> - <property name="halign">end</property> - <signal name="clicked" handler="_on_account_settings" swapped="no"/> - <child> - <object class="GtkImage"> + <property name="spacing">18</property> + <child type="center"> + <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">preferences-other-symbolic</property> + <property name="label"><name></property> + <style> + <class name="large-header"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="adhoc_commands_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Execute Command…</property> - <signal name="clicked" handler="_on_adhoc_commands" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">utilities-terminal-symbolic</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Account Settings…</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_account_settings" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-other-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="account_page_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="valign">center</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">view-more-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> </child> </object> <packing> @@ -249,21 +234,23 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="status_message_box"> + <object class="GtkBox" id="status_box"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="halign">center</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <placeholder/> + </child> <child> <placeholder/> </child> @@ -271,7 +258,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -287,7 +274,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> ===================================== gajim/gtk/account_page.py ===================================== @@ -15,24 +15,20 @@ from __future__ import annotations from typing import Any -from typing import Union from gi.repository import Gdk -from gi.repository import GLib from gi.repository import Gtk -from nbxmpp.protocol import JID from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize -from gajim.common.events import AccountConnected -from gajim.common.events import AccountDisconnected from gajim.common.events import MucDecline from gajim.common.events import MucInvitation from gajim.common.events import SubscribePresenceReceived from gajim.common.events import UnsubscribedPresenceReceived from gajim.gtk.builder import get_builder +from gajim.gtk.menus import get_account_menu from gajim.gtk.menus import get_roster_view_menu from gajim.gtk.notification_manager import NotificationManager from gajim.gtk.roster import Roster @@ -58,11 +54,11 @@ def __init__(self, account: str) -> None: self._status_selector = StatusSelector(account=account) self._status_selector.set_halign(Gtk.Align.CENTER) - self._ui.account_action_box.add(self._status_selector) + self._ui.status_box.add(self._status_selector) self._status_message_selector = StatusMessageSelector(account=account) self._status_message_selector.set_halign(Gtk.Align.CENTER) - self._ui.status_message_box.add(self._status_message_selector) + self._ui.status_box.add(self._status_message_selector) self._notification_manager = NotificationManager(account) self._ui.account_box.add(self._notification_manager) @@ -74,11 +70,8 @@ def __init__(self, account: str) -> None: self._ui.paned.connect('button-release-event', self._on_button_release) self._ui.roster_menu_button.set_menu_model(get_roster_view_menu()) - - self._ui.edit_profile_button.set_action_name( - f'app.{self._account}-profile') - self._ui.edit_profile_button.set_action_target_value( - GLib.Variant('s', self._account)) + self._ui.account_page_menu_button.set_menu_model( + get_account_menu(account)) self._ui.connect_signals(self) @@ -94,8 +87,6 @@ def __init__(self, account: str) -> None: ged.GUI1, self._unsubscribed_received), ('muc-invitation', ged.GUI1, self._muc_invitation_received), ('muc-decline', ged.GUI1, self._muc_invitation_declined), - ('account-connected', ged.GUI2, self._on_account_state), - ('account-disconnected', ged.GUI2, self._on_account_state), ]) # pylint: enable=line-too-long @@ -116,20 +107,6 @@ def _on_account_settings(self, _button: Gtk.Button) -> None: window = open_window('AccountsWindow') window.select_account(self._account) - def _on_adhoc_commands(self, _button: Gtk.Button) -> None: - server_jid = JID.from_string(self._jid).domain - open_window('AdHocCommands', account=self._account, jid=server_jid) - - def _on_account_state(self, - event: Union[AccountConnected, AccountDisconnected] - ) -> None: - - if event.account != self._account: - return - - self._ui.adhoc_commands_button.set_sensitive( - app.account_is_connected(event.account)) - def _on_search_changed(self, widget: Gtk.SearchEntry) -> None: text = widget.get_text().lower() self._roster.set_search_string(text) ===================================== gajim/gtk/builder.pyi ===================================== @@ -6,6 +6,7 @@ from gi.repository import Atk from gi.repository import Gtk from gi.repository import GtkSource + class Builder(Gtk.Builder): ... @@ -17,11 +18,9 @@ class AccountPageBuilder(Builder): roster_search_entry: Gtk.SearchEntry account_box: Gtk.Box avatar_image: Gtk.Image - edit_profile_button: Gtk.Button account_label: Gtk.Label - account_action_box: Gtk.Box - adhoc_commands_button: Gtk.Button - status_message_box: Gtk.Box + account_page_menu_button: Gtk.MenuButton + status_box: Gtk.Box class AccountWizardBuilder(Builder): ===================================== gajim/gtk/menus.py ===================================== @@ -141,9 +141,13 @@ def get_groupchat_menu(contact: GroupchatContact) -> GajimMenu: def get_account_menu(account: str) -> GajimMenu: + client = app.get_client(account) + server_jid = client.get_own_jid().domain + menuitems: MenuItemListT = [ (_('Profile'), f'app.{account}-profile', account), (_('Discover Services…'), f'app.{account}-services', account), + (_('Execute Command…'), f'app.{account}-execute-command', server_jid), (_('Server Info'), f'app.{account}-server-info', account), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3d1d8cbb9346b252c501283e609635… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3d1d8cbb9346b252c501283e609635… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AccountPage: Add menu entry for adding contacts
by Daniel Brötzmann (＠wurstsalat) 08 Jan '23

08 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b3d1d8cb by wurstsalat at 2023-01-08T15:44:07+01:00 imprv: AccountPage: Add menu entry for adding contacts - - - - - 1 changed file: - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -434,6 +434,7 @@ def get_roster_view_menu() -> GajimMenu: menuitems: MenuItemListT = [ (_('Show Offline Contacts'), 'win.show-offline', None), (_('Sort by Status'), 'win.sort-by-show', None), + (_('Add Contact…'), 'app.add-contact', ''), ] return GajimMenu.from_list(menuitems) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b3d1d8cbb9346b252c501283e6096356… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b3d1d8cbb9346b252c501283e6096356… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] 75 commits: new: Add PyGObject-stubs as optional dependency
by Daniel Brötzmann (＠wurstsalat) 07 Jan '23

07 Jan '23

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: 6918456e by Philipp Hörist at 2022-12-17T22:11:46+01:00 new: Add PyGObject-stubs as optional dependency - - - - - 84bbda53 by Philipp Hörist at 2022-12-17T23:35:59+01:00 cfix: Define codespell dependency correctly - - - - - c14daba2 by Philipp Hörist at 2022-12-17T23:41:59+01:00 new: Add more optional dependencies for development - - - - - 57f18dc6 by Philipp Hörist at 2022-12-19T01:08:47+01:00 ci: Adapt to pygobject-stub changes Old libraries need to be specified at install time - - - - - 67ab4b10 by Philipp Hörist at 2022-12-19T16:25:33+01:00 cq: Use pyright specific ignore code - - - - - 91889803 by Philipp Hörist at 2022-12-19T19:17:55+01:00 ci: Update ruff config - - - - - 7a8a7d55 by wurstsalat at 2022-12-20T09:29:25+01:00 fix: Commands: Attempt to parse only if message can have a command Fixes #11341 - - - - - 9fa214eb by mesonium at 2022-12-20T09:37:40+00:00 fix: Audio Preview: Don't let seekbar handle jump to end on EOS when user is seeking - - - - - 3a383cb9 by mesonium at 2022-12-20T14:47:42+01:00 fix: Audio Preview: Follow-up to 9fa214eb: Fix visuals on EOS while seeking - - - - - 71adf765 by Philipp Hörist at 2022-12-20T21:12:20+01:00 other: Add more package metadata - - - - - b2f70668 by Philipp Hörist at 2022-12-21T23:39:51+01:00 fix: ConversationView: Simplify merging messages Simplify the logic and fix wrong merges under some conditions - - - - - 119590f4 by Philipp Hörist at 2022-12-22T22:19:37+01:00 fix: AccountWizard: Remove subscriptions after successfull login Calling _disconnect() removes all subscriptions and cleans up the client. Fixes #11342 - - - - - 184e3fab by Philipp Hörist at 2022-12-22T23:27:42+01:00 ci: Temporary freeze pyright version - - - - - 218ea886 by Philipp Hörist at 2022-12-23T00:48:00+01:00 cq: Scripts: cast filename to string - - - - - 0ff8fb9a by Philipp Hörist at 2022-12-23T00:49:45+01:00 refactor: Plugins: Move PluginManifest into own module This fixes import cycles - - - - - 08e7113b by Philipp Hörist at 2022-12-23T01:08:28+01:00 ci: Unfreeze pyright version - - - - - a4cc40e2 by Philipp Hörist at 2022-12-23T01:10:22+01:00 cfix: Main: Import PluginManifest from correct module - - - - - d710b97b by Philipp Hörist at 2022-12-23T01:12:03+01:00 cq: Remove unused import - - - - - f233e830 by Philipp Hörist at 2022-12-23T01:16:01+01:00 cfix: Plugins: Allow GajimPlugin import directly from package - - - - - 76160c14 by Philipp Hörist at 2022-12-23T01:17:12+01:00 cq: Plugins: Fix quotes - - - - - 6a6683a1 by mjk at 2022-12-25T10:26:30+00:00 refactor: Adapt to nbxmpp text_to_color() changes - - - - - 1d426f44 by wurstsalat at 2022-12-25T12:09:36+01:00 chore: Update DOAP - - - - - 39419831 by Philipp Hörist at 2022-12-26T09:56:07+01:00 cfix: Improve command detection - - - - - fadd0d77 by Philipp Hörist at 2022-12-26T10:15:38+01:00 fix: Settings: Add migration for global MUC search api endpoint - - - - - 747c5696 by Philipp Hörist at 2022-12-28T16:23:51+01:00 change: Port to libsoup3 - Remove all direct usage of libsoup and use the nbxmpp.http module instead - - - - - 20edba3b by Philipp Hörist at 2022-12-28T17:20:35+01:00 change: Depend on Python 3.10 - - - - - 10047641 by Philipp Hörist at 2022-12-28T17:25:46+01:00 cq: Set strict parameter when using zip() - - - - - 01701050 by Philipp Hörist at 2022-12-28T18:16:02+01:00 chore: Update .gitignore - - - - - ceb4a10a by Philipp Hörist at 2022-12-28T18:16:43+01:00 ci: Fix invoking pyright - - - - - 3d27187f by Philipp Hörist at 2022-12-29T17:26:11+01:00 refactor: Adapt to nbxmpp http changes - - - - - 6ff261bf by Philipp Hörist at 2022-12-29T20:56:02+01:00 cq: Use specific error codes with noqa - - - - - 4a49825f by Philipp Hörist at 2022-12-29T23:29:13+01:00 refactor: Remove unused code - - - - - d084fd30 by mesonium at 2022-12-30T16:59:08+01:00 feat: Audio Preview: Visualization: Add centerline and improve color palette - Visually distinguish left / right audio channels - Use CSS defined colors - - - - - 1f54a80e by Philipp Hörist at 2023-01-01T10:54:13+01:00 chore: Update .gitignore - - - - - 787405ac by Philipp Hörist at 2023-01-01T10:56:28+01:00 refactor: Simplify HigDialog - Remove unused code - Simplify inheritence - Better handle markup - - - - - d7d80b47 by Philipp Hörist at 2023-01-02T19:22:29+01:00 cq: Use OSError instead of alias - - - - - 0ef3cf9d by Philipp Hörist at 2023-01-02T20:17:19+01:00 ci: Add pre-commit config - - - - - 7bf5267c by Philipp Hörist at 2023-01-02T20:18:24+01:00 other: Remove obsolete script - - - - - c63d3324 by Philipp Hörist at 2023-01-02T22:26:09+01:00 ci: Add isort config - - - - - 26afcb62 by Philipp Hörist at 2023-01-02T22:31:33+01:00 ci: Update pre-commit config - - - - - 756b0008 by Philipp Hörist at 2023-01-03T00:35:54+01:00 cq: Fix typos - - - - - 94d509e8 by Philipp Hörist at 2023-01-03T00:50:02+01:00 ci: Update pre-commit config - - - - - a2c64772 by Philipp Hörist at 2023-01-03T00:50:21+01:00 cq: Sort imports with isort - - - - - 1ff40989 by André Apitzsch at 2023-01-03T10:01:40+01:00 chore: Update copyright year - - - - - cee802f2 by wurstsalat at 2023-01-05T12:02:51+01:00 fix: MessageActionsBox: Restore emoji button behavior Fixes #11350 - - - - - 88b9c97d by André Apitzsch at 2023-01-05T13:30:39+01:00 chore: Flatpak: Update dependencies - - - - - bf7824ae by wurstsalat at 2023-01-05T17:16:16+01:00 fix: CertificateBox: Format serial number in hex Fixes #11335 - - - - - f8f4f934 by Philipp Hörist at 2023-01-05T19:44:33+01:00 chore: Update pre-commit deps - - - - - b81e8ac8 by Philipp Hörist at 2023-01-05T19:55:27+01:00 refactor: Simplify yield and any() checks - - - - - bfa05b72 by Philipp Hörist at 2023-01-05T20:05:13+01:00 chore: Update .gitignore - - - - - 5a9012d7 by Philipp Hörist at 2023-01-05T20:31:53+01:00 refactor: Plugins: Move plugin events into own module This avoids import cycles - - - - - 015662ba by Philipp Hörist at 2023-01-05T20:55:32+01:00 refactor: Plugins: Use relative imports This avoids import circles - - - - - 7c1a0047 by Philipp Hörist at 2023-01-05T21:14:11+01:00 refactor: Rows: Move click handler into message module This avoids import circles - - - - - c0256ec6 by Philipp Hörist at 2023-01-06T10:33:08+01:00 ci: Run isort check - - - - - 88bfeba4 by Philipp Hörist at 2023-01-06T15:09:45+01:00 change: Raise required nbxmpp version to 4.0.0 - - - - - 7212d00a by Philipp Hörist at 2023-01-06T15:18:10+01:00 cfix: Fix typo in requirements - - - - - 1adf9f51 by Philipp Hörist at 2023-01-06T15:19:26+01:00 ci: Fix ruff version - - - - - 13e8cce2 by Weblate at 2023-01-06T16:01:24+01:00 chore: Update translations - - - - - 2484c634 by Philipp Hörist at 2023-01-06T16:02:42+01:00 chore: Update IANA data - - - - - 14d951fd by Philipp Hörist at 2023-01-06T16:21:49+01:00 ci: Windows: Ignore Soup 2.4 in dependency check - - - - - ed399554 by Philipp Hörist at 2023-01-06T16:33:44+01:00 ci: Windows: Fail appveyor build on exception - - - - - c70e2981 by Philipp Hörist at 2023-01-06T17:10:03+01:00 ci: Windows: Don’t fail on dependency check - - - - - ad50d091 by Philipp Hörist at 2023-01-06T19:46:18+01:00 other: Update dev dependencies in setup.cfg - - - - - fc4675b9 by André at 2023-01-06T19:38:42+00:00 other: Add script to update flatpak manifests - - - - - ea93fc5d by Philipp Hörist at 2023-01-07T09:56:22+01:00 release: 1.6.0 - - - - - e2b8061a by mesonium at 2023-01-07T10:42:01+01:00 fix: GroupChat: Display reason when group chat is destroyed - - - - - a8474927 by Philipp Hörist at 2023-01-07T11:36:02+01:00 ci: Execute gitlab release script earlier - - - - - cbecf724 by André Apitzsch at 2023-01-07T12:33:58+00:00 ci: Update submodule in flathub repo Source of the update-index command: https://stackoverflow.com/q/33514642 - - - - - 2a43353c by mesonium at 2023-01-07T12:34:48+00:00 cq: Cleanup unused local variables - Remove never used variables - Try to incorporate declared but not used variable where it seemed to be in the author's original intention - - - - - 7402594f by Philipp Hörist at 2023-01-07T14:13:35+01:00 ci: Handle race conditions better when creating ftp folder Retrieving a list of folders to check if a folder is created leads to a race condition, if multiple jobs try to deploy at the same time. - - - - - 331a2330 by Philipp Hörist at 2023-01-07T16:09:55+01:00 refactor: Remove dynamic GUI import This was an intended to provide a possibility to develop alternative GUIs for specific dialogs but didnt catch on. - Use absolut imports everywhere - - - - - 937055b8 by Philipp Hörist at 2023-01-07T16:12:06+01:00 ci: Remove obsolete script - - - - - 8efaf615 by Philipp Hörist at 2023-01-07T16:13:15+01:00 chore: Update .gitignore - - - - - bc6cb276 by Philipp Hörist at 2023-01-07T16:47:53+01:00 refactor: Restructure unittests - Separate GUI tests from common tests - Rename folders - - - - - 9d97cfe6 by wurstsalat at 2023-01-07T22:14:04+01:00 feat: Add support for XEP-0461: Message Replies - - - - - 30 changed files: - .ci/appveyor.yml - .ci/appveyor_build.py - .ci/debian_build.py - .ci/deploy.py - − .ci/link-gtk.py - .ci/make_release.py - .githooks/update - .gitignore - .gitlab-ci.yml - + .pre-commit-config.yaml - CONTRIBUTING.md - ChangeLog - README.md - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - debian/control - debian/copyright - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - flatpak/shared-modules - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/commands.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/const.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bacff0210de55a89829716a860e5a40… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bacff0210de55a89829716a860e5a40… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Restructure unittests
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc6cb276 by Philipp Hörist at 2023-01-07T16:47:53+01:00 refactor: Restructure unittests - Separate GUI tests from common tests - Rename folders - - - - - 21 changed files: - pyproject.toml - test/gtk/__init__.py → test/common/__init__.py - test/no_gui/test_contacts.py → test/common/test_contacts.py - test/no_gui/test_regex.py → test/common/test_regex.py - test/no_gui/test_sanitize_filename.py → test/common/test_sanitize_filename.py - test/no_gui/test_styling.py → test/common/test_styling.py - test/no_gui/test_text_util.py → test/common/test_text_util.py - test/no_gui/test_uri_util.py → test/common/test_uri_util.py - test/no_gui/__init__.py → test/dialogs/__init__.py - test/gtk/assistant.py → test/dialogs/assistant.py - test/gtk/certificate_dialog.py → test/dialogs/certificate_dialog.py - test/gtk/change_password.py → test/dialogs/change_password.py - test/gtk/dataform.py → test/dialogs/dataform.py - test/gtk/fake_dataform.py → test/dialogs/fake_dataform.py - test/gtk/groupchat_info.py → test/dialogs/groupchat_info.py - test/gtk/ssl_error_dialog.py → test/dialogs/ssl_error_dialog.py - test/gtk/util.py → test/dialogs/util.py - + test/gui/__init__.py - test/no_gui/test_gtk_menus.py → test/gui/test_menus.py - test/no_gui/test_nick_completion.py → test/gui/test_nick_completion.py - test/no_gui/test_gtk_util.py → test/gui/test_util.py Changes: ===================================== pyproject.toml ===================================== @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [tool.codespell] -skip = "*__pycache__*,test,*.egg-info,.git,*.po,*.nsi,*.spec" +skip = "*__pycache__*,build,test,*.egg-info,.git,*.po,*.nsi,*.spec" ignore-words-list = "claus,pres,ser,trough" @@ -149,7 +149,6 @@ exclude = [ "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 @@ -162,8 +161,8 @@ target-version = "py310" [tool.ruff.per-file-ignores] "test/*" = ["E402"] -"test/no_gui/test_styling.py" = ["RUF001", "E501"] -"test/no_gui/test_regex.py" = ["RUF001"] +"test/common/test_styling.py" = ["RUF001", "E501"] +"test/common/test_regex.py" = ["RUF001"] [tool.ruff.mccabe] ===================================== test/gtk/__init__.py → test/common/__init__.py ===================================== ===================================== test/no_gui/test_contacts.py → test/common/test_contacts.py ===================================== ===================================== test/no_gui/test_regex.py → test/common/test_regex.py ===================================== ===================================== test/no_gui/test_sanitize_filename.py → test/common/test_sanitize_filename.py ===================================== ===================================== test/no_gui/test_styling.py → test/common/test_styling.py ===================================== ===================================== test/no_gui/test_text_util.py → test/common/test_text_util.py ===================================== ===================================== test/no_gui/test_uri_util.py → test/common/test_uri_util.py ===================================== ===================================== test/no_gui/__init__.py → test/dialogs/__init__.py ===================================== ===================================== test/gtk/assistant.py → test/dialogs/assistant.py ===================================== ===================================== test/gtk/certificate_dialog.py → test/dialogs/certificate_dialog.py ===================================== ===================================== test/gtk/change_password.py → test/dialogs/change_password.py ===================================== ===================================== test/gtk/dataform.py → test/dialogs/dataform.py ===================================== ===================================== test/gtk/fake_dataform.py → test/dialogs/fake_dataform.py ===================================== ===================================== test/gtk/groupchat_info.py → test/dialogs/groupchat_info.py ===================================== ===================================== test/gtk/ssl_error_dialog.py → test/dialogs/ssl_error_dialog.py ===================================== ===================================== test/gtk/util.py → test/dialogs/util.py ===================================== ===================================== test/gui/__init__.py ===================================== ===================================== test/no_gui/test_gtk_menus.py → test/gui/test_menus.py ===================================== ===================================== test/no_gui/test_nick_completion.py → test/gui/test_nick_completion.py ===================================== ===================================== test/no_gui/test_gtk_util.py → test/gui/test_util.py ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc6cb276b8097b833bb867f5045190f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bc6cb276b8097b833bb867f5045190f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Remove dynamic GUI import
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 331a2330 by Philipp Hörist at 2023-01-07T16:09:55+01:00 refactor: Remove dynamic GUI import This was an intended to provide a possibility to develop alternative GUIs for specific dialogs but didnt catch on. - Use absolut imports everywhere - - - - - 937055b8 by Philipp Hörist at 2023-01-07T16:12:06+01:00 ci: Remove obsolete script - - - - - 8efaf615 by Philipp Hörist at 2023-01-07T16:13:15+01:00 chore: Update .gitignore - - - - - 30 changed files: - − .ci/link-gtk.py - .gitignore - .gitlab-ci.yml - gajim/common/app.py - gajim/common/client.py - gajim/common/types.py - gajim/gajim.py - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/add_contact.py - gajim/gtk/adhoc.py - gajim/gtk/advanced_config.py - gajim/gtk/app_page.py - gajim/gtk/app_side_bar.py - gajim/gtk/application.py - gajim/gtk/assistant.py - gajim/gtk/avatar.py - gajim/gtk/avatar_selector.py - gajim/gtk/blocking.py - gajim/gtk/bookmarks.py - gajim/gtk/call_window.py - gajim/gtk/certificate_dialog.py - gajim/gtk/change_password.py - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_banner.py - gajim/gtk/chat_function_page.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_row.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7402594f83785041f213f64a1fe00c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7402594f83785041f213f64a1fe00c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Handle race conditions better when creating ftp folder
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7402594f by Philipp Hörist at 2023-01-07T14:13:35+01:00 ci: Handle race conditions better when creating ftp folder Retrieving a list of folders to check if a folder is created leads to a race condition, if multiple jobs try to deploy at the same time. - - - - - 1 changed file: - .ci/deploy.py Changes: ===================================== .ci/deploy.py ===================================== @@ -10,6 +10,7 @@ import os import sys from datetime import date +from ftplib import error_perm from ftplib import FTP_TLS from pathlib import Path @@ -70,9 +71,10 @@ def get_dir_list(ftp: FTP_TLS) -> list[str]: def create_release_folder(ftp: FTP_TLS, tag: str) -> None: ftp.cwd(RELEASE_FOLDER_BASE) folder = get_release_folder_from_tag(tag) - dir_list = get_dir_list(ftp) - if folder not in dir_list: + try: ftp.mkd(folder) + except error_perm: + pass ftp.cwd(folder) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7402594f83785041f213f64a1fe00c39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7402594f83785041f213f64a1fe00c39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Cleanup unused local variables
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2a43353c by mesonium at 2023-01-07T12:34:48+00:00 cq: Cleanup unused local variables - Remove never used variables - Try to incorporate declared but not used variable where it seemed to be in the author's original intention - - - - - 9 changed files: - .ci/debian_build.py - gajim/common/call_manager.py - gajim/common/modules/bytestream.py - gajim/common/proxy65_manager.py - gajim/gtk/control.py - gajim/gtk/discovery.py - gajim/gtk/menus.py - gajim/gtk/server_info.py - scripts/get_iana_data.py Changes: ===================================== .ci/debian_build.py ===================================== @@ -61,7 +61,7 @@ def prepare_package_dir(context: ReleaseContext) -> None: log.info('Rename dir to: %s', context.release_name) folder = list(BUILD_DIR.glob(f'{context.app}-?.?.?'))[0] - folder = folder.rename(context.release_dir) + folder.rename(context.release_dir) log.info('Copy debian folder into release directory') shutil.copytree(ROOT_DIR / 'debian', context.release_dir / 'debian') ===================================== gajim/common/call_manager.py ===================================== @@ -106,13 +106,11 @@ def _on_jingle_connected(self, event.fjid, event.sid) if event.media == 'audio': - content = session.get_content('audio') self._set_jingle_state( 'audio', JingleState.CONNECTED, event.sid) if event.media == 'video': - content = session.get_content('video') self._set_jingle_state( 'video', JingleState.CONNECTED, ===================================== gajim/common/modules/bytestream.py ===================================== @@ -597,7 +597,6 @@ def _on_bytestream_set(self, id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') sid = query.getAttr('sid') - file_props = FilesProp.getFileProp(self._account, sid) streamhosts: list[dict[str, Any]] = [] for item in query.getChildren(): if item.getName() == 'streamhost': ===================================== gajim/common/proxy65_manager.py ===================================== @@ -62,9 +62,7 @@ def resolve(self, proxy, connection, sender_jid, default=None, Start if testit=False, Gajim won't try to resolve it ''' - if proxy in self.proxies: - resolver = self.proxies[proxy] - else: + if proxy not in self.proxies: # proxy is being resolved for the first time resolver = ProxyResolver(proxy, sender_jid, testit) self.proxies[proxy] = resolver ===================================== gajim/gtk/control.py ===================================== @@ -633,8 +633,6 @@ def _request_history(self, self._scrolled_view.block_signals(True) - rows: list[HistoryRowT] = [] - messages = self._request_messages(before) event_rows = self._request_events(before) rows = self._sort_request_rows(messages, event_rows, before) ===================================== gajim/gtk/discovery.py ===================================== @@ -416,7 +416,7 @@ def _disco_info_received(self, task): type='im', name=result.node)] - self._on_agent_info(str(result.jid), result.node, result.identities, + self._on_agent_info(str(result.jid), result.node, identities, result.features, result.dataforms) def _disco_info_error(self, result): ===================================== gajim/gtk/menus.py ===================================== @@ -594,7 +594,7 @@ def get_groupchat_mod_menu(self_contact: types.GroupchatParticipant, value = GLib.Variant('as', [contact_name, 'participant']) menu.add_item(_('Grant Voice'), action, value) else: - value = value = GLib.Variant('as', [contact_name, 'visitor']) + value = GLib.Variant('as', [contact_name, 'visitor']) menu.add_item(_('Revoke Voice'), action, value) if not menu.get_n_items(): ===================================== gajim/gtk/server_info.py ===================================== @@ -151,7 +151,6 @@ def _add_connection_info(self) -> None: tls_version = TLS_VERSION_STRINGS.get(nbxmpp_client.tls_version) self._ui.tls_version.set_text(tls_version or _('Not available')) - visible = nbxmpp_client.ciphersuite is not None self._ui.cipher_suite.set_text(nbxmpp_client.ciphersuite or _('Not available')) ===================================== scripts/get_iana_data.py ===================================== @@ -40,7 +40,7 @@ def parse_uri_schemes(content: str) -> list[str]: def generate_output(schemes: list[str], - out_path: Path): + outpath: Path) -> None: logging.info('Generate output') current_date = datetime.utcnow().isoformat() @@ -68,6 +68,5 @@ def generate_output(schemes: list[str], scheme_content = download_file(SCHEMES_URL) schemes = parse_uri_schemes(scheme_content) - output = generate_output(schemes, - outpath) + generate_output(schemes, outpath) logging.info('Finished !') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a43353ca247f1250edffc01dd124d6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a43353ca247f1250edffc01dd124d6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update submodule in flathub repo
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: cbecf724 by André Apitzsch at 2023-01-07T12:33:58+00:00 ci: Update submodule in flathub repo Source of the update-index command: https://stackoverflow.com/q/33514642 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -134,10 +134,14 @@ deploy-flatpak: - eval $(ssh-agent -s) - .ci/prepare_git.sh github.com "${FLATHUB_DEPLOY_KEY}" script: + # extract the current commit hash of the shared-modules submodule + - submodule_commit=$(git submodule status flatpak/shared-modules | cut -c 2-41) - git clone git@github.com:flathub/org.gajim.Gajim.git - cd org.gajim.Gajim - mv ../flatpak/org.gajim.Gajim.yaml org.gajim.Gajim.yaml - mv ../flatpak/app-overrides.json app-overrides.json + # point the shared-modules submodule to the new commit, without fetching the repository + - git update-index --cacheinfo 160000,${submodule_commit},shared-modules - git diff - git add --all - git commit -m "$CI_COMMIT_TAG" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbecf724ccaf33972036bae9ac5e41ac… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbecf724ccaf33972036bae9ac5e41ac… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Execute gitlab release script earlier
by Philipp Hörist (＠lovetox) 07 Jan '23

07 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: a8474927 by Philipp Hörist at 2023-01-07T11:36:02+01:00 ci: Execute gitlab release script earlier - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -153,6 +153,7 @@ publish-release: - eval $(ssh-agent -s) - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}" script: + - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" - git clone git@dev.gajim.org:gajim/website.git - cd website - git checkout master @@ -161,4 +162,3 @@ publish-release: - git add -u - git commit -m "Release Gajim $CI_COMMIT_TAG" - git push - - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8474927bd2f1861a4e3750a55805308… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8474927bd2f1861a4e3750a55805308… 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