From ab40f8d41836d24a7f47551b2642d00812d881ee Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Mon, 18 Nov 2024 09:12:35 +0100
Subject: [PATCH] main-window: Make sure to rename "cancel" action eveyrwhere

In commit 3e84850def, we grouped together the several "cancel-*" actions
into a single "cancel" action. The idea being that we want to make sure
the "wrong" cancel method isn't being called.

However, in doing so, we forgot to rename a couple of instances,
effectively breaking the "Cancel" button in some cases in the UI. This
commit now pushes through the rename in those cases too.

Fixes: 3e84850def ("main-window: Allow Escape to cancel selection mode")
---
 data/ui/contacts-main-window.ui | 2 +-
 src/contacts-main-window.vala   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/ui/contacts-main-window.ui b/data/ui/contacts-main-window.ui
index 8be05e07..87d73745 100644
--- a/data/ui/contacts-main-window.ui
+++ b/data/ui/contacts-main-window.ui
@@ -274,7 +274,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                             <property name="visible">False</property>
                             <property name="label" translatable="yes">_Cancel</property>
                             <property name="use_underline">True</property>
-                            <property name="action-name">win.edit-contact-cancel</property>
+                            <property name="action-name">win.cancel</property>
                             <property name="can-shrink">True</property>
                           </object>
                         </child>
diff --git a/src/contacts-main-window.vala b/src/contacts-main-window.vala
index 0b2e743e..c5e42499 100644
--- a/src/contacts-main-window.vala
+++ b/src/contacts-main-window.vala
@@ -455,7 +455,7 @@ public class Contacts.MainWindow : Adw.ApplicationWindow {
     string response = yield dialog.choose (this, null);
 
     if (response == "discard") {
-      activate_action ("edit-contact-cancel", null);
+      activate_action ("cancel", null);
       return true;
     } else {
       return false;
-- 
GitLab