From d5e89a9fd1bdd3fdadfbd3c9a562e738684d048f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <tintou@noel.tf>
Date: Fri, 31 May 2024 16:47:02 +0200
Subject: [PATCH] CloseDialog: Reuse the Gala.App object to get the
 user-visible title (#1944)

---
 src/Dialogs.vala       | 18 +++++-------------
 src/WindowManager.vala |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index b576b4de9..6e0364eff 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -130,24 +130,16 @@ namespace Gala {
             construct { parent = value; }
         }
 
-        // this function isn't exported in glib.vapi
-        [CCode (cname = "g_locale_from_utf8")]
-        extern static string locale_from_utf8 (
-            string str,
-            ssize_t len = -1,
-            out size_t bytes_read = null,
-            out size_t bytes_wrriten = null,
-            out Error err = null
-        );
-
-        public CloseDialog (Meta.Window window) {
-            Object (window: window);
+        public App app { get; construct; }
+
+        public CloseDialog (Gala.App app, Meta.Window window) {
+            Object (app: app, window: window);
         }
 
         construct {
             icon = "computer-fail";
 
-            var window_title = locale_from_utf8 (window.title) ?? window.get_sandboxed_app_id ();
+            var window_title = app.name;
             if (window_title != null) {
                 title = _("“%s” is not responding").printf (window_title);
             } else {
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index a085c14fb..b7714a5ef 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -2333,7 +2333,7 @@ namespace Gala {
         }
 
         public override Meta.CloseDialog? create_close_dialog (Meta.Window window) {
-            return new CloseDialog (window);
+            return new CloseDialog (window_tracker.get_app_for_window (window), window);
         }
 
         public override unowned Meta.PluginInfo? plugin_info () {