AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cssprovider: Have a private error variable

Browse Source
This commit is contained in:
Benjamin Otte 2011-04-07 12:38:53 +02:00
parent c18dc15694
commit 707ba8597f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkcssprovider.c
View File

@ -801,6 +801,7 @@ struct _GtkCssProviderPrivate
GSList *state;
GSList *cur_selectors;
GHashTable *cur_properties;
GError *error;
};
enum ParserScope {
@ -1612,6 +1613,10 @@ css_provider_reset_parser (GtkCssProvider *css_provider)
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) property_value_free);
if (priv->error)
g_error_free (priv->error);
priv->error = NULL;
}
static void
@ -3540,10 +3545,9 @@ parse_stylesheet (GtkCssProvider *css_provider,
while (!g_scanner_eof (priv->scanner))
{
GTokenType expected_token;
GError *err = NULL;
css_provider_reset_parser (css_provider);
expected_token = parse_rule (css_provider, priv->scanner, &err);
expected_token = parse_rule (css_provider, priv->scanner, &priv->error);
if (expected_token != G_TOKEN_NONE)
{
@ -3553,8 +3557,8 @@ parse_stylesheet (GtkCssProvider *css_provider,
if (error != NULL)
{
result = FALSE;
if (err)
g_propagate_error (error, err);
if (priv->error)
g_propagate_error (error, priv->error);
else
g_set_error_literal (error,
GTK_CSS_PROVIDER_ERROR,
@ -3564,8 +3568,9 @@ parse_stylesheet (GtkCssProvider *css_provider,
}
else
{
scanner_report_warning (css_provider, expected_token, err);
g_clear_error (&err);
scanner_report_warning (css_provider, expected_token, priv->error);
g_clear_error (&priv->error);
priv->error = NULL;
}
css_provider_reset_parser (css_provider);