From 2ca59be48b44bf1778ed32f468c627268daad4d6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 1 Sep 2025 08:56:54 +0200
Subject: [PATCH 1/2] Cosmetics

Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8896>
---
 docs/reference/gtk/running.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/reference/gtk/running.md b/docs/reference/gtk/running.md
index 5fceb2506b8..2cee0236661 100644
--- a/docs/reference/gtk/running.md
+++ b/docs/reference/gtk/running.md
@@ -162,6 +162,8 @@ mainly for easy debugging of theme issues.
 It is also possible to specify a theme variant to load, by appending
 the variant name with a colon, like this: `GTK_THEME=Adwaita:dark`.
 
+## Other environment variables
+
 The following environment variables are used by GdkPixbuf, GDK or
 Pango, not by GTK itself, but we list them here for completeness
 nevertheless.
-- 
GitLab


From 3cbf57384b66ec57e2d64342149b8ed12be5a628 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 1 Sep 2025 08:53:50 +0200
Subject: [PATCH 2/2] Make GTK_THEME work as before

Follow-up to 0bfbbf22c7af5b2ea, where we changed the settings
code to always pass a non-NULL variant, but only updated one of
the two 'if (variant)' conditions to 'if (variant && *variant)'.

Fixes #7731

Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8896>
---
 gtk/gtkcssprovider.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 236471a6685..6bfb60a8c79 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1865,7 +1865,7 @@ _gtk_css_find_theme (const char *name,
   int i;
   char *dir;
 
-  if (variant)
+  if (variant && *variant)
     g_snprintf (file, sizeof (file), "gtk-%s.css", variant);
   else
     strcpy (file, "gtk.css");
-- 
GitLab

