From ddd164c230b706d98521b5b40dc15cf84c319664 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Fri, 13 Jan 2012 18:08:12 -0500 Subject: [PATCH] provider: use _gtk_css_parse_read_url() in parse_import() Instead of _gtk_css_parser_read_uri(), which is going away. --- gtk/gtkcssprovider.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 280cd554b2..044cc4cfc4 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1760,7 +1760,6 @@ static gboolean parse_import (GtkCssScanner *scanner) { GFile *file; - char *uri; gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_IMPORT); @@ -1771,20 +1770,26 @@ parse_import (GtkCssScanner *scanner) } if (_gtk_css_parser_is_string (scanner->parser)) - uri = _gtk_css_parser_read_string (scanner->parser); - else - uri = _gtk_css_parser_read_uri (scanner->parser); + { + char *uri; - if (uri == NULL) + uri = _gtk_css_parser_read_string (scanner->parser); + file = g_file_resolve_relative_path (gtk_css_scanner_get_base_url (scanner), uri); + g_free (uri); + } + else + { + file = _gtk_css_parser_read_url (scanner->parser, + gtk_css_scanner_get_base_url (scanner)); + } + + if (file == NULL) { _gtk_css_parser_resync (scanner->parser, TRUE, 0); gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT); return TRUE; } - file = g_file_resolve_relative_path (gtk_css_scanner_get_base_url (scanner), uri); - g_free (uri); - if (gtk_css_scanner_would_recurse (scanner, file)) { char *path = g_file_get_path (file);