[gtk+] cssprovider: Improve error handling for import errors

[Benjamin Otte <otte src gnome org>]

commit 6f9cc94fae39726d08729b52eb29b59e0c8b4ce3
Author: Benjamin Otte <otte redhat com>
Date:   Mon Jan 16 18:44:43 2012 +0100

    cssprovider: Improve error handling for import errors
    
    We don't want to include the whitespace after an import statement.
    Because people tend to add newlines after @import, we report the wrong
    lines for failed imports. And that's bad.

 gtk/gtkcssprovider.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 462b551..5285d29 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1790,7 +1790,7 @@ parse_import (GtkCssScanner *scanner)
       return TRUE;
     }
 
-  if (!_gtk_css_parser_try (scanner->parser, ";", TRUE))
+  if (!_gtk_css_parser_try (scanner->parser, ";", FALSE))
     {
       gtk_css_provider_invalid_token (scanner->provider, scanner, "semicolon");
       _gtk_css_parser_resync (scanner->parser, TRUE, 0);
@@ -1818,6 +1818,8 @@ parse_import (GtkCssScanner *scanner)
   g_object_unref (file);
 
   gtk_css_scanner_pop_section (scanner, GTK_CSS_SECTION_IMPORT);
+  _gtk_css_parser_skip_whitespace (scanner->parser);
+
   return TRUE;
 }