Merge branch 'wip/otte/for-master' into 'master'

cssprovider: Be clearer about warnings vs errors

See merge request GNOME/gtk!3980
This commit is contained in:
Benjamin Otte 2021-09-20 05:38:27 +00:00
commit d19f4ad53a
2 changed files with 3 additions and 2 deletions

View File

@ -296,7 +296,7 @@ wl_shm_format (void *data,
{
GDK_NOTE (MISC,
char buf[10];
g_message ("supported pixel format %s", get_format_name (format, buf));
g_message ("supported pixel format %s (0x%X)", get_format_name (format, buf), (guint) format);
);
}

View File

@ -180,7 +180,8 @@ gtk_css_provider_parsing_error (GtkCssProvider *provider,
{
char *s = gtk_css_section_to_string (section);
g_warning ("Theme parsing error: %s: %s",
g_warning ("Theme parser %s: %s: %s",
error->domain == GTK_CSS_PARSER_WARNING ? "warning" : "error",
s,
error->message);