From 8fb6fdd3e73162a3f32caf021c7019363d46adf4 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 11 Apr 2011 02:18:21 +0200 Subject: [PATCH] cssprovider: Do error handling differently Instead of aborting a parse whenever we encounter an error, parse to the end. But if a GError was passed in, reset the provider completely as if nothing had been parsed. --- gtk/gtkcssprovider.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 9e6d3c8572..c121bed7ea 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -2622,27 +2622,6 @@ parse_stylesheet (GtkCssProvider *css_provider, if (expected_token != G_TOKEN_NONE) { - /* If a GError was passed in, propagate the error and bail out, - * else report a warning and keep going - */ - if (error != NULL) - { - result = FALSE; - if (priv->error) - g_propagate_error (error, priv->error); - else - g_set_error_literal (error, - GTK_CSS_PROVIDER_ERROR, - GTK_CSS_PROVIDER_ERROR_FAILED, - "Error parsing stylesheet"); - break; - } - else - { - g_clear_error (&priv->error); - priv->error = NULL; - } - css_provider_reset_parser (css_provider); while (!g_scanner_eof (scanner) &&