From 5dd1e721a6c25048823e3635c5f6b9f07f4d4afb Mon Sep 17 00:00:00 2001
From: Christopher Davis <brainblasted@disroot.org>
Date: Thu, 14 Jan 2021 13:51:07 -0800
Subject: [PATCH 1/2] providers_dialog: Use GtkShortcut instead of event
 controller

This is much cleaner and can be done within the UI file.
---
 data/resources/ui/providers_dialog.ui | 11 +++++++++++
 src/widgets/providers/dialog.rs       | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/resources/ui/providers_dialog.ui b/data/resources/ui/providers_dialog.ui
index 95fbaef..5b6ba9c 100644
--- a/data/resources/ui/providers_dialog.ui
+++ b/data/resources/ui/providers_dialog.ui
@@ -76,5 +76,16 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class='GtkShortcutController'>
+        <property name='scope'>global</property>
+        <child>
+          <object class='GtkShortcut'>
+            <property name='trigger'>Escape</property>
+            <property name='action'>action(window.close)</property>
+          </object>
+        </child>
+      </object>
+    </child>
   </template>
 </interface>
diff --git a/src/widgets/providers/dialog.rs b/src/widgets/providers/dialog.rs
index 40a41d1..de8b482 100644
--- a/src/widgets/providers/dialog.rs
+++ b/src/widgets/providers/dialog.rs
@@ -144,17 +144,6 @@ impl ProvidersDialog {
 
         let deck_page = self_.deck.append(&self_.page).unwrap();
         deck_page.set_name("provider");
-
-        let event_controller = gtk::EventControllerKey::new();
-        event_controller.connect_key_pressed(
-            clone!(@weak self as widget => @default-return Inhibit(false), move |_, k, _, _| {
-                if k == gdk::keys::Key::from_name("Escape") {
-                    widget.close();
-                }
-                Inhibit(false)
-            }),
-        );
-        self.add_controller(&event_controller);
     }
 
     fn setup_actions(&self) {

From 3c5f426e371cc23d61afd7f385c97baa3cebe05e Mon Sep 17 00:00:00 2001
From: Christopher Davis <brainblasted@disroot.org>
Date: Thu, 14 Jan 2021 13:54:41 -0800
Subject: [PATCH 2/2] account_add: Use GtkShortcut instead of event controller

GtkShortcut is much cleaner than manually adding the
GtkEventControllerKey and checking for the right key.
---
 data/resources/ui/account_add.ui | 11 +++++++++++
 src/widgets/accounts/add.rs      | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/resources/ui/account_add.ui b/data/resources/ui/account_add.ui
index 232b7fc..af3f559 100644
--- a/data/resources/ui/account_add.ui
+++ b/data/resources/ui/account_add.ui
@@ -221,6 +221,17 @@
         </child>
       </object>
     </child>
+    <child>
+      <object class='GtkShortcutController'>
+        <property name='scope'>global</property>
+        <child>
+          <object class='GtkShortcut'>
+            <property name='trigger'>Escape</property>
+            <property name='action'>action(window.close)</property>
+          </object>
+        </child>
+      </object>
+    </child>
   </template>
   <object class="GtkEntryCompletion" id="provider_completion">
     <property name="minimum-key-length">1</property>
diff --git a/src/widgets/accounts/add.rs b/src/widgets/accounts/add.rs
index c4226b7..accb933 100644
--- a/src/widgets/accounts/add.rs
+++ b/src/widgets/accounts/add.rs
@@ -136,17 +136,6 @@ impl AccountAddDialog {
         self_
             .token_entry
             .connect_changed(clone!(@weak self as win => move |_| win.validate()));
-
-        let event_controller = gtk::EventControllerKey::new();
-        event_controller.connect_key_pressed(
-            clone!(@weak self as widget => @default-return Inhibit(false), move |_, k, _, _| {
-                if k == gdk::keys::Key::from_name("Escape") {
-                    widget.close();
-                }
-                Inhibit(false)
-            }),
-        );
-        self.add_controller(&event_controller);
     }
 
     fn scan_qr(&self) -> Result<()> {