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 9f3ea374ef92b4f4649f70b567011f00b4ddb125..eb56d8e478544ffada9cb82f3541bba1b97c463d 100644 (file)
--- 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 c22854d6e13c32ff341b7300749ebc1ae3ab4190..d6711af3877f74bc4a6578c98d2e651fac3138d8 100644 (file)
--- 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 fc3a3a6c9dfab91ee5d2cfc6aa0a27a69ac315da..d99e088ea0c8d8aea7c56adeb33f4e0ce66840a1 100644 (file)
--- 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 deca14500467f31a2e6d731adf69a526e42d18f2..6649fc4ef331214eb19ea3ae7efc39d816f393ad 100644 (file)
--- 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 a568c7c11b2d5413473cea76f05d92d5794c6385..8dcda0018ddc111115cde7b2e5c3a6d9a2fc40af 100644 (file)
--- 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");