summaryrefslogtreecommitdiff
path: root/gtk/gtkcssstylepropertyimpl.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-04-05 22:22:52 +0200
committerBenjamin Otte <otte@redhat.com>2012-04-17 08:59:20 +0200
commit51da8cb263be618ec30f365a0b492c39f006a7cc (patch)
tree928627300ad6bef1e5dc304502dd9b55395dceaa /gtk/gtkcssstylepropertyimpl.c
parent83be7e5dbd33a22f809dc78d4aaab951b290d710 (diff)
downloadgtk+-51da8cb263be618ec30f365a0b492c39f006a7cc.tar.gz
symboliccolor: Parse 'currentColor' everywhere
Diffstat (limited to 'gtk/gtkcssstylepropertyimpl.c')
-rw-r--r--gtk/gtkcssstylepropertyimpl.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 2f365ead22..58be0bc143 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -183,16 +183,9 @@ color_parse (GtkCssStyleProperty *property,
{
GtkSymbolicColor *symbolic;
- if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
- {
- symbolic = gtk_symbolic_color_ref (_gtk_symbolic_color_get_current_color ());
- }
- else
- {
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
- return NULL;
- }
+ symbolic = _gtk_css_parser_read_symbolic_color (parser);
+ if (symbolic == NULL)
+ return NULL;
return _gtk_css_value_new_take_symbolic_color (symbolic);
}