diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-04-05 22:22:52 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:20 +0200 |
| commit | 51da8cb263be618ec30f365a0b492c39f006a7cc (patch) | |
| tree | 928627300ad6bef1e5dc304502dd9b55395dceaa /gtk/gtkcssstylefuncs.c | |
| parent | 83be7e5dbd33a22f809dc78d4aaab951b290d710 (diff) | |
| download | gtk+-51da8cb263be618ec30f365a0b492c39f006a7cc.tar.gz | |
symboliccolor: Parse 'currentColor' everywhere
Diffstat (limited to 'gtk/gtkcssstylefuncs.c')
| -rw-r--r-- | gtk/gtkcssstylefuncs.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c index 3315fbfdbc..b1a097e90d 100644 --- a/gtk/gtkcssstylefuncs.c +++ b/gtk/gtkcssstylefuncs.c @@ -169,16 +169,9 @@ rgba_value_parse (GtkCssParser *parser, GtkSymbolicColor *symbolic; GdkRGBA rgba; - 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 FALSE; - } + symbolic = _gtk_css_parser_read_symbolic_color (parser); + if (symbolic == NULL) + return FALSE; if (gtk_symbolic_color_resolve (symbolic, NULL, &rgba)) { @@ -312,16 +305,9 @@ symbolic_color_value_parse (GtkCssParser *parser, { 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 FALSE; - } + symbolic = _gtk_css_parser_read_symbolic_color (parser); + if (symbolic == NULL) + return FALSE; g_value_take_boxed (value, symbolic); return TRUE; |