callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Rename struct variable

Browse Source 
I want to add parse_func as something different soon.
This commit is contained in:
Benjamin Otte
2011-05-26 00:09:26 +02:00
parent 3e7f74c456
commit 35488f5846
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkcssprovider.c
View File

@ -2094,7 +2094,7 @@ parse_declaration (GtkCssScanner *scanner,
g_param_value_set_default (property->pspec, val); g_param_value_set_default (property->pspec, val);
gtk_css_ruleset_add (ruleset, property, val); gtk_css_ruleset_add (ruleset, property, val);
} }
else if (property->parse_func) else if (property->property_parse_func)
{ {
GError *error = NULL; GError *error = NULL;
char *value_str; char *value_str;
@ -2107,8 +2107,10 @@ parse_declaration (GtkCssScanner *scanner,
return; return;
} }
if ((*property->parse_func) (value_str, val, &error)) if ((*property->property_parse_func) (value_str, val, &error))
{
gtk_css_ruleset_add (ruleset, property, val); gtk_css_ruleset_add (ruleset, property, val);
}
else else
{ {
gtk_css_provider_take_error (scanner->provider, scanner, error); gtk_css_provider_take_error (scanner->provider, scanner, error);

2
gtk/gtkstyleproperties.c
View File

@ -348,7 +348,7 @@ gtk_style_properties_lookup_property (const gchar *property_name,
*pspec = node->pspec; *pspec = node->pspec;
if (parse_func) if (parse_func)
*parse_func = node->parse_func; *parse_func = node->property_parse_func;
found = TRUE; found = TRUE;
} }

4
gtk/gtkstyleproperty.c
View File

@ -1641,7 +1641,7 @@ _gtk_style_property_lookup (const char *name)
void void
_gtk_style_property_register (GParamSpec *pspec, _gtk_style_property_register (GParamSpec *pspec,
GtkStylePropertyParser parse_func, GtkStylePropertyParser property_parse_func,
GtkStyleUnpackFunc unpack_func, GtkStyleUnpackFunc unpack_func,
GtkStylePackFunc pack_func) GtkStylePackFunc pack_func)
{ {
@ -1662,7 +1662,7 @@ _gtk_style_property_register (GParamSpec *pspec,
node = g_slice_new0 (GtkStyleProperty); node = g_slice_new0 (GtkStyleProperty);
node->pspec = pspec; node->pspec = pspec;
node->parse_func = parse_func; node->property_parse_func = property_parse_func;
node->pack_func = pack_func; node->pack_func = pack_func;
node->unpack_func = unpack_func; node->unpack_func = unpack_func;

4
gtk/gtkstylepropertyprivate.h
View File

@ -35,7 +35,7 @@ typedef void (* GtkStylePackFunc) (GValue
struct _GtkStyleProperty struct _GtkStyleProperty
{ {
GParamSpec *pspec; GParamSpec *pspec;
GtkStylePropertyParser parse_func; GtkStylePropertyParser property_parse_func;
GtkStyleUnpackFunc unpack_func; GtkStyleUnpackFunc unpack_func;
GtkStylePackFunc pack_func; GtkStylePackFunc pack_func;
}; };
@ -43,7 +43,7 @@ struct _GtkStyleProperty
const GtkStyleProperty * _gtk_style_property_lookup (const char *name); const GtkStyleProperty * _gtk_style_property_lookup (const char *name);
void _gtk_style_property_register (GParamSpec *pspec, void _gtk_style_property_register (GParamSpec *pspec,
GtkStylePropertyParser parse_func, GtkStylePropertyParser property_parse_func,
GtkStyleUnpackFunc unpack_func, GtkStyleUnpackFunc unpack_func,
GtkStylePackFunc pack_func); GtkStylePackFunc pack_func);