provider: use _gtk_css_parse_read_url() in parse_import()

Instead of _gtk_css_parser_read_uri(), which is going away.

1 files changed, 12 insertions, 7 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);
+    {
+      char *uri;
+
+      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
-    uri = _gtk_css_parser_read_uri (scanner->parser);
+    {
+      file = _gtk_css_parser_read_url (scanner->parser,
+                                       gtk_css_scanner_get_base_url (scanner));
+    }
 
-  if (uri == NULL)
+  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);