AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-09 10:20:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
Revert "css: Simplify theme loading"

Closes #6991

See merge request GNOME/gtk!7702
This commit is contained in:
Matthias Clasen 2024-09-09 12:35:57 +00:00
commit 43303bf7e5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcssprovider.c
View File

@ -1420,16 +1420,23 @@ void
gtk_css_provider_load_from_resource (GtkCssProvider *css_provider,
const char *resource_path)
{
GBytes *bytes;
GFile *file;
char *uri, *escaped;
g_return_if_fail (GTK_IS_CSS_PROVIDER (css_provider));
g_return_if_fail (resource_path != NULL);
bytes = g_resources_lookup_data (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
escaped = g_uri_escape_string (resource_path,
G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, FALSE);
uri = g_strconcat ("resource://", escaped, NULL);
g_free (escaped);
gtk_css_provider_load_from_bytes (css_provider, bytes);
file = g_file_new_for_uri (uri);
g_free (uri);
g_bytes_unref (bytes);
gtk_css_provider_load_from_file (css_provider, file);
g_object_unref (file);
}
char *