From 29e2b15236e8daa624b6c5b0fe56e929179b071a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 5 Feb 2021 00:47:06 +0100
Subject: [PATCH] data: Rename custom close icon

Resource icons are added to the fallback icon theme, so they won't
get used if a matching icon is found in the configured theme.

That includes fallback names, so Adwaita's "window-close-symbolic"
takes precedence over "window-close-24-symbolic" in hicolor.

Fix this by using a custom name for a custom icon.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1640>
---
 data/gnome-shell-theme.gresource.xml | 2 +-
 js/ui/windowPreview.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index a626c4fe6..1f6908827 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -20,7 +20,7 @@
     <file alias="icons/scalable/actions/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
     <file alias="icons/scalable/actions/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
     <file alias="icons/scalable/actions/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
-    <file alias="icons/scalable/actions/window-close-24-symbolic.svg">window-close-24-symbolic.svg</file>
+    <file alias="icons/scalable/actions/preview-close-symbolic.svg">window-close-24-symbolic.svg</file>
     <file alias="icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
     <file alias="icons/scalable/status/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
     <file alias="icons/scalable/status/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js
index fddb62e26..b40222de0 100644
--- a/js/ui/windowPreview.js
+++ b/js/ui/windowPreview.js
@@ -353,7 +353,7 @@ var WindowPreview = GObject.registerClass({
         this._closeButton = new St.Button({
             visible: false,
             style_class: 'window-close',
-            child: new St.Icon({ icon_name: 'window-close-24-symbolic' }),
+            child: new St.Icon({ icon_name: 'preview-close-symbolic' }),
         });
         this._closeButton.add_constraint(new Clutter.BindConstraint({
             source: this._windowContainer,