From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 27 Mar 2020 15:20:59 +0000 (+0000)
Subject: Rename GResources for standard GTK themes
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~19^2~23^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1003d6ae88cfbd36cb6fe105b46244d1eecd738;p=gtk4.git

Rename GResources for standard GTK themes

After commit 2ab9be54fb34c61eedbbb89b78ce9db23ba81e8a we had to rename
the generated CSS files to be included into the GResource bundle; we
kept the URI stable to avoid too much churn, and allow backporting the
change to the 3.24 stable branch. This had the adverse effect of making
it harder to debug issues, as the on-disk file name does not match the
location in the GResource that will be used to print out warnings,
errors, and debugging messages.
---

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index 9f3ea374ef..eb56d8e478 100644
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -20,8 +20,8 @@ xml += '''
     <file>theme/Empty/gtk.css</file>
     <file>theme/Adwaita/gtk.css</file>
     <file>theme/Adwaita/gtk-dark.css</file>
-    <file alias='theme/Adwaita/gtk-contained.css'>theme/Adwaita/Adwaita.css</file>
-    <file alias='theme/Adwaita/gtk-contained-dark.css'>theme/Adwaita/Adwaita-dark.css</file>
+    <file>theme/Adwaita/Adwaita.css</file>
+    <file>theme/Adwaita/Adwaita-dark.css</file>
 '''
 
 for f in get_files('theme/Adwaita/assets', '.png'):
@@ -35,8 +35,8 @@ for f in get_files('theme/Adwaita/assets', '.svg'):
 xml += '''
     <file>theme/HighContrast/gtk.css</file>
     <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>
-    <file alias='theme/HighContrast/gtk-contained.css'>theme/HighContrast/HighContrast.css</file>
-    <file alias='theme/HighContrast/gtk-contained-inverse.css'>theme/HighContrast/HighContrast-inverse.css</file>
+    <file>theme/HighContrast/HighContrast.css</file>
+    <file>theme/HighContrast/HighContrast-inverse.css</file>
 '''
 
 for f in get_files('theme/HighContrast/assets', '.png'):
diff --git a/gtk/theme/Adwaita/gtk-dark.css b/gtk/theme/Adwaita/gtk-dark.css
index c22854d6e1..d6711af387 100644
--- a/gtk/theme/Adwaita/gtk-dark.css
+++ b/gtk/theme/Adwaita/gtk-dark.css
@@ -1 +1 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained-dark.css");
+@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css");
diff --git a/gtk/theme/Adwaita/gtk.css b/gtk/theme/Adwaita/gtk.css
index fc3a3a6c9d..d99e088ea0 100644
--- a/gtk/theme/Adwaita/gtk.css
+++ b/gtk/theme/Adwaita/gtk.css
@@ -1 +1 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained.css");
+@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita.css");
diff --git a/gtk/theme/HighContrast/gtk-inverse.css b/gtk/theme/HighContrast/gtk-inverse.css
index deca145004..6649fc4ef3 100644
--- a/gtk/theme/HighContrast/gtk-inverse.css
+++ b/gtk/theme/HighContrast/gtk-inverse.css
@@ -1 +1 @@
-@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained-inverse.css");
+@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-inverse.css");
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index a568c7c11b..8dcda0018d 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -1 +1 @@
-@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");
+@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast.css");