[gtk+] cssprovider: @import <string> is valid CSS



commit 5eefc37b3fce8ad708d9414ac934b873bc01042a
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jul 20 01:19:59 2011 +0200

    cssprovider: @import <string> is valid CSS
    
    The parser rewrite insisted on @import url(<string>) syntax, but CSS
    xplicitly allows omitting the url string.

 gtk/gtkcssprovider.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 4be5b75..6ffb1a6 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1670,7 +1670,10 @@ parse_import (GtkCssScanner *scanner)
   GFile *file;
   char *uri;
 
-  uri = _gtk_css_parser_read_uri (scanner->parser);
+  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);
   if (uri == NULL)
     {
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]