From 778976f8dae536ed0eef46cbf1e212418d001555 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 May 2024 15:44:39 -0400 Subject: [PATCH 1/2] css: Propagate errors properly We should not change the domain and code when we propagate errors that happen while parsing variable references. Pointed out in https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7308. --- gtk/gtkcssreferencevalue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcssreferencevalue.c b/gtk/gtkcssreferencevalue.c index 19092b2ca7..27881cb17d 100644 --- a/gtk/gtkcssreferencevalue.c +++ b/gtk/gtkcssreferencevalue.c @@ -224,11 +224,11 @@ parser_error (GtkCssParser *parser, if (names[i + 1]) g_set_error (&new_error, - GTK_CSS_PARSER_ERROR, GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE, + error->domain, error->code, "While expanding %s: %s", names[i + 1], error->message); else g_set_error_literal (&new_error, - GTK_CSS_PARSER_ERROR, GTK_CSS_PARSER_ERROR_UNKNOWN_VALUE, + error->domain, error->code, error->message); if (vars[i]->section == NULL) From a1d2169992eeb3a2d1603a2d673e579cc169bec7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 May 2024 15:46:42 -0400 Subject: [PATCH 2/2] Document GTK_DEBUG_CSS This was overlooked in b603479fe220629. --- gtk/gtkdebug.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index 2ca4a999ca..32809c79ba 100644 --- a/gtk/gtkdebug.h +++ b/gtk/gtkdebug.h @@ -76,6 +76,13 @@ G_BEGIN_DECLS * Since: 4.8 */ +/** + * GTK_DEBUG_CSS: + * + * Information about deprecated CSS features. + * + * Since: 4.16 + */ typedef enum { GTK_DEBUG_TEXT = 1 << 0, GTK_DEBUG_TREE = 1 << 1,