From 54548fdd06555c33b3b19af6def150419e5744ca Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:07 +0000
Subject: [PATCH] Use action instead of on_alias_back_pressed function
---
briar-gtk/briar_gtk/actions/add_contact.py | 8 ++++++++
briar-gtk/briar_gtk/containers/add_contact.py | 6 +-----
briar-gtk/data/ui/add_contact.ui | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/add_contact.py b/briar-gtk/briar_gtk/actions/add_contact.py
index 01f965f..aadeed8 100644
--- a/briar-gtk/briar_gtk/actions/add_contact.py
+++ b/briar-gtk/briar_gtk/actions/add_contact.py
@@ -16,10 +16,18 @@ class AddContactActions(Actions):
def _setup_actions(self):
self._setup_proceed_from_links_action()
+ self._setup_return_from_alias_action()
def _setup_proceed_from_links_action(self):
self._setup_action("proceed-from-links", None, self._proceed_from_links)
+ def _setup_return_from_alias_action(self):
+ self._setup_action("return-from-alias", None, self._return_from_alias)
+
# pylint: disable=unused-argument
def _proceed_from_links(self, action, parameter):
self.widget.proceed_from_links()
+
+ # pylint: disable=unused-argument
+ def _return_from_alias(self, action, parameter):
+ self.widget.show_links_page()
diff --git a/briar-gtk/briar_gtk/containers/add_contact.py b/briar-gtk/briar_gtk/containers/add_contact.py
index 5f1a03a..9689fa8 100644
--- a/briar-gtk/briar_gtk/containers/add_contact.py
+++ b/briar-gtk/briar_gtk/containers/add_contact.py
@@ -101,11 +101,7 @@ class AddContactContainer(Container):
def _on_alias_enter(self, widget):
self.on_add_contact_pressed(None)
- # pylint: disable=unused-argument
- def on_alias_back_pressed(self, button):
- self._show_links_page()
-
- def _show_links_page(self):
+ def show_links_page(self):
links_page = self.builder.get_object("links_page")
self.add_contact_flow_stack.set_visible_child(links_page)
diff --git a/briar-gtk/data/ui/add_contact.ui b/briar-gtk/data/ui/add_contact.ui
index c62c14e..0ba33b2 100644
--- a/briar-gtk/data/ui/add_contact.ui
+++ b/briar-gtk/data/ui/add_contact.ui
@@ -229,7 +229,7 @@
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="clicked" handler="on_alias_back_pressed"/>
+ <property name="action_name">add-contact.return-from-alias</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
--
GitLab