diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2023-02-19 12:45:28 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2023-02-19 12:47:19 +0300 |
| commit | 2959a47de22f9d06fc38ab8f98bd572c2adf8abe (patch) | |
| tree | 8dbf177967093c292f14de1cf9c6ac211e12bd7c | |
| parent | 9ae5487e96da5fbdb7c72ddd67e844095bbbc95b (diff) | |
refactor: Simplify action lookup
| -rw-r--r-- | gajim/gtk/application.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/chat_action_processor.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/main.py | 2 | ||||
| -rw-r--r-- | gajim/gtk/notification_manager.py | 15 |
4 files changed, 9 insertions, 12 deletions
diff --git a/gajim/gtk/application.py b/gajim/gtk/application.py index ad40a119e..8b692a5de 100644 --- a/gajim/gtk/application.py +++ b/gajim/gtk/application.py @@ -471,7 +471,7 @@ class GajimApplication(Gtk.Application, CoreApplication): def set_action_state(self, action_name: str, state: bool) -> None: action = self.lookup_action(action_name) - assert action is not None + assert isinstance(action, Gio.SimpleAction) action.set_enabled(state) def set_account_actions_state(self, diff --git a/gajim/gtk/chat_action_processor.py b/gajim/gtk/chat_action_processor.py index c6e4ec823..14f9f3486 100644 --- a/gajim/gtk/chat_action_processor.py +++ b/gajim/gtk/chat_action_processor.py @@ -276,6 +276,7 @@ class ChatActionProcessor(Gtk.Popover): def _on_item_clicked(self, _button: Gtk.MenuButton, index: int) -> None: variant = self._menu.get_item_attribute_value( index, 'action-data') + assert variant is not None self._replace_text(variant.get_string()) self.popdown() @@ -292,6 +293,7 @@ class ChatActionProcessor(Gtk.Popover): if self._item_has_focus(item): variant = self._menu.get_item_attribute_value( items.index(item), 'action-data') + assert variant is not None return variant.get_string() return '' diff --git a/gajim/gtk/main.py b/gajim/gtk/main.py index 92b256364..4cc1bc6d2 100644 --- a/gajim/gtk/main.py +++ b/gajim/gtk/main.py @@ -165,7 +165,7 @@ class MainWindow(Gtk.ApplicationWindow, EventHelper): def get_action(self, name: str) -> Gio.SimpleAction: action = self.lookup_action(name) - assert action is not None + assert isinstance(action, Gio.SimpleAction) return action def get_chat_stack(self) -> ChatStack: diff --git a/gajim/gtk/notification_manager.py b/gajim/gtk/notification_manager.py index 3fe888330..23b4d9af8 100644 --- a/gajim/gtk/notification_manager.py +++ b/gajim/gtk/notification_manager.py @@ -90,29 +90,24 @@ class NotificationManager(Gtk.ListBox): online = app.account_is_connected(self._account) blocking_support = self._client.get_module('Blocking').supported - sub_accept = app.window.lookup_action( + sub_accept = app.window.get_action( f'subscription-accept-{self._account}') - assert sub_accept is not None sub_accept.set_enabled(online) - sub_deny = app.window.lookup_action( + sub_deny = app.window.get_action( f'subscription-deny-{self._account}') - assert sub_deny is not None sub_deny.set_enabled(online) - sub_deny_all = app.window.lookup_action( + sub_deny_all = app.window.get_action( f'subscription-deny-all-{self._account}') - assert sub_deny_all is not None sub_deny_all.set_enabled(online) - sub_block = app.window.lookup_action( + sub_block = app.window.get_action( f'subscription-block-{self._account}') - assert sub_block is not None sub_block.set_enabled(online and blocking_support) - sub_report = app.window.lookup_action( + sub_report = app.window.get_action( f'subscription-report-{self._account}') - assert sub_report is not None sub_report.set_enabled(online and blocking_support) def _remove_actions(self) -> None: |