diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-07-14 20:24:46 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-08-28 15:40:56 +0200 |
| commit | 09f9fd42b4bbc35e0883771512089fd9b5673621 (patch) | |
| tree | e714856fee132c47059b33ca8ee75a04e2b0f061 /gtk/gtkcssstylepropertyimpl.c | |
| parent | 9b4ed662181cabde506248cf8b344420a0300a3e (diff) | |
| download | gtk+-09f9fd42b4bbc35e0883771512089fd9b5673621.tar.gz | |
css: Fold color value computation into gtksymboliccolor.c
This gets rid of the public function
_gtk_css_rgba_value_compute_from_symbolic().
The fallback is now handled using a switch statement instead of letting
the caller pass the function.
Diffstat (limited to 'gtk/gtkcssstylepropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssstylepropertyimpl.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 162ab3a69f..bf7fa993f8 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -185,10 +185,7 @@ color_compute (GtkCssStyleProperty *property, GtkStyleContext *context, GtkCssValue *specified) { - return _gtk_css_rgba_value_compute_from_symbolic (specified, - _gtk_css_style_property_get_initial_value (property), - context, - FALSE); + return _gtk_css_value_compute (specified, _gtk_css_style_property_get_id (property), context); } static GtkCssValue * @@ -196,14 +193,7 @@ color_property_compute (GtkCssStyleProperty *property, GtkStyleContext *context, GtkCssValue *specified) { - GtkCssValue *value; - - value = _gtk_css_rgba_value_compute_from_symbolic (specified, - _gtk_css_style_property_get_initial_value (property), - context, - TRUE); - _gtk_css_rgba_value_get_rgba (value); - return value; + return _gtk_css_value_compute (specified, _gtk_css_style_property_get_id (property), context); } static void |