summaryrefslogtreecommitdiff
path: root/gtk/gtkcssprovider.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-05-26 01:01:44 +0200
committerBenjamin Otte <otte@redhat.com>2011-06-02 02:03:50 +0200
commit5a42464547a06a080f532044a35683f82fe67f2e (patch)
treead067982404e0518af8d01f4e5d5fb0e459d875a /gtk/gtkcssprovider.c
parent35488f58461d53a92992cfeff686e5a2c972500d (diff)
downloadgtk+-5a42464547a06a080f532044a35683f82fe67f2e.tar.gz
css: Rename function to _gtk_style_property_parse_value()
... and take an optional style property as argument. This way, we can allow custom parse functions for properties. The style property needs to be optional so that we can use it for widget style properties, too.
Diffstat (limited to 'gtk/gtkcssprovider.c')
-rw-r--r--gtk/gtkcssprovider.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1b3c12e062..5d35797f3e 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1371,9 +1371,10 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
gtk_css_provider_parser_error,
provider);
- found = _gtk_css_value_parse (value,
- parser,
- NULL);
+ found = _gtk_style_property_parse_value (NULL,
+ value,
+ parser,
+ NULL);
_gtk_css_parser_free (parser);
@@ -2122,9 +2123,10 @@ parse_declaration (GtkCssScanner *scanner,
}
else
{
- if (_gtk_css_value_parse (val,
- scanner->parser,
- gtk_css_scanner_get_base_url (scanner)))
+ if (_gtk_style_property_parse_value (property,
+ val,
+ scanner->parser,
+ gtk_css_scanner_get_base_url (scanner)))
{
if (_gtk_css_parser_begins_with (scanner->parser, ';') ||
_gtk_css_parser_begins_with (scanner->parser, '}') ||