]> Pileus Git - ~andy/gtk/commitdiff
cssprovider: use INVALID_SYNTAX for unexpected token error
authorBenjamin Otte <otte@redhat.com>
Thu, 7 Apr 2011 22:18:38 +0000 (00:18 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 18 May 2011 19:58:44 +0000 (21:58 +0200)
gtk/gtkcssprovider.c

index e0a42c734f234b2bd7412593e01dce0348e070ff..e04d7392dc09095c3f5fa10701a2afdce05ae600 100644 (file)
@@ -1633,7 +1633,7 @@ gtk_css_provider_invalid_token (GtkCssProvider *provider,
 {
   gtk_css_provider_error (provider,
                           GTK_CSS_PROVIDER_ERROR,
-                          GTK_CSS_PROVIDER_ERROR_FAILED,
+                          GTK_CSS_PROVIDER_ERROR_SYNTAX,
                           "expected a valid %s", expected);
 }
 
@@ -3657,10 +3657,12 @@ parse_rule (GtkCssProvider  *css_provider,
 
 find_end_of_declaration:
       while (scanner->token != ';' &&
-             scanner->token != G_TOKEN_RIGHT_CURLY)
+             scanner->token != G_TOKEN_RIGHT_CURLY &&
+             scanner->token != G_TOKEN_EOF)
         g_scanner_get_next_token (scanner);
       
-      if (scanner->token == G_TOKEN_RIGHT_CURLY)
+      if (scanner->token == G_TOKEN_RIGHT_CURLY ||
+          scanner->token == G_TOKEN_EOF)
         break;
 
       g_scanner_get_next_token (scanner);