Commit 35488f58 authored by Benjamin Otte's avatar Benjamin Otte

css: Rename struct variable

I want to add parse_func as something different soon.
parent 3e7f74c4
......@@ -2094,7 +2094,7 @@ parse_declaration (GtkCssScanner *scanner,
g_param_value_set_default (property->pspec, val);
gtk_css_ruleset_add (ruleset, property, val);
}
else if (property->parse_func)
else if (property->property_parse_func)
{
GError *error = NULL;
char *value_str;
......@@ -2106,9 +2106,11 @@ parse_declaration (GtkCssScanner *scanner,
g_slice_free (GValue, val);
return;
}
if ((*property->parse_func) (value_str, val, &error))
gtk_css_ruleset_add (ruleset, property, val);
if ((*property->property_parse_func) (value_str, val, &error))
{
gtk_css_ruleset_add (ruleset, property, val);
}
else
{
gtk_css_provider_take_error (scanner->provider, scanner, error);
......
......@@ -348,7 +348,7 @@ gtk_style_properties_lookup_property (const gchar *property_name,
*pspec = node->pspec;
if (parse_func)
*parse_func = node->parse_func;
*parse_func = node->property_parse_func;
found = TRUE;
}
......
......@@ -1641,7 +1641,7 @@ _gtk_style_property_lookup (const char *name)
void
_gtk_style_property_register (GParamSpec *pspec,
GtkStylePropertyParser parse_func,
GtkStylePropertyParser property_parse_func,
GtkStyleUnpackFunc unpack_func,
GtkStylePackFunc pack_func)
{
......@@ -1662,7 +1662,7 @@ _gtk_style_property_register (GParamSpec *pspec,
node = g_slice_new0 (GtkStyleProperty);
node->pspec = pspec;
node->parse_func = parse_func;
node->property_parse_func = property_parse_func;
node->pack_func = pack_func;
node->unpack_func = unpack_func;
......
......@@ -35,7 +35,7 @@ typedef void (* GtkStylePackFunc) (GValue
struct _GtkStyleProperty
{
GParamSpec *pspec;
GtkStylePropertyParser parse_func;
GtkStylePropertyParser property_parse_func;
GtkStyleUnpackFunc unpack_func;
GtkStylePackFunc pack_func;
};
......@@ -43,7 +43,7 @@ struct _GtkStyleProperty
const GtkStyleProperty * _gtk_style_property_lookup (const char *name);
void _gtk_style_property_register (GParamSpec *pspec,
GtkStylePropertyParser parse_func,
GtkStylePropertyParser property_parse_func,
GtkStyleUnpackFunc unpack_func,
GtkStylePackFunc pack_func);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment