[gtk+] cssstyleproperty: Replace symbolic colors with GtkCssColorValue

[Benjamin Otte <otte src gnome org>]

commit bd31bd6d632f03b0915a463c16fb8cdaf34ba11c
Author: Benjamin Otte <otte redhat com>
Date:   Thu Nov 8 17:22:56 2012 +0100

    cssstyleproperty: Replace symbolic colors with GtkCssColorValue

 gtk/gtkcssshorthandpropertyimpl.c |   10 ++++----
 gtk/gtkcssstylepropertyimpl.c     |   41 ++++++++----------------------------
 2 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 0e9524d..0b467ab 100644
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -27,6 +27,7 @@
 #include "gtkcssarrayvalueprivate.h"
 #include "gtkcssbgsizevalueprivate.h"
 #include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsseasevalueprivate.h"
 #include "gtkcssenumvalueprivate.h"
@@ -39,7 +40,6 @@
 #include "gtkcssstylefuncsprivate.h"
 #include "gtkcssvalueprivate.h"
 #include "gtkstylepropertiesprivate.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtktypebuiltins.h"
 
 /* this is in case round() is not provided by the compiler, 
@@ -217,7 +217,7 @@ parse_border_color (GtkCssShorthandProperty  *shorthand,
 
   for (i = 0; i < 4; i++)
     {
-      values[i] = _gtk_css_symbolic_value_new (parser);
+      values[i] = _gtk_css_color_value_parse (parser);
       if (values[i] == NULL)
         return FALSE;
 
@@ -349,7 +349,7 @@ parse_border_side (GtkCssShorthandProperty  *shorthand,
       }
     else if (values[2] == NULL)
       {
-        values[2] = _gtk_css_symbolic_value_new (parser);
+        values[2] = _gtk_css_color_value_parse (parser);
         if (values[2] == NULL)
           return FALSE;
       }
@@ -388,7 +388,7 @@ parse_border (GtkCssShorthandProperty  *shorthand,
       }
     else if (!G_IS_VALUE (&values[8]))
       {
-        values[8] = _gtk_css_symbolic_value_new (parser);
+        values[8] = _gtk_css_color_value_parse (parser);
         if (values[8] == NULL)
           return FALSE;
 
@@ -516,7 +516,7 @@ parse_one_background (GtkCssShorthandProperty  *shorthand,
         }
       else if (values[6] == NULL)
         {
-          value = _gtk_css_symbolic_value_new (parser);
+          value = _gtk_css_color_value_parse (parser);
           if (value == NULL)
             values[6] = _gtk_css_value_ref (_gtk_css_style_property_get_initial_value 
                                             (_gtk_css_shorthand_property_get_subproperty (shorthand, 6)));
diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c
index 82f59a2..7a559f9 100644
--- a/gtk/gtkcssstylepropertyimpl.c
+++ b/gtk/gtkcssstylepropertyimpl.c
@@ -42,6 +42,7 @@
 #include "gtkcssarrayvalueprivate.h"
 #include "gtkcssbgsizevalueprivate.h"
 #include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcsseasevalueprivate.h"
 #include "gtkcssenginevalueprivate.h"
@@ -55,7 +56,6 @@
 #include "gtkcssrgbavalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstringvalueprivate.h"
-#include "gtksymboliccolorprivate.h"
 #include "gtkthemingengine.h"
 #include "gtktypebuiltins.h"
 #include "gtkwin32themeprivate.h"
@@ -171,7 +171,7 @@ static GtkCssValue *
 color_parse (GtkCssStyleProperty *property,
              GtkCssParser        *parser)
 {
-  return _gtk_css_symbolic_value_new (parser);
+  return _gtk_css_color_value_parse (parser);
 }
 
 static void
@@ -853,17 +853,6 @@ background_position_parse (GtkCssStyleProperty *property,
 
 /*** REGISTRATION ***/
 
-static GtkSymbolicColor *
-gtk_symbolic_color_new_rgba (double red,
-                             double green,
-                             double blue,
-                             double alpha)
-{
-  GdkRGBA rgba = { red, green, blue, alpha };
-
-  return gtk_symbolic_color_new_literal (&rgba);
-}
-
 void
 _gtk_css_style_property_init_properties (void)
 {
@@ -878,8 +867,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
+                                          _gtk_css_color_value_new_rgba (1, 1, 1, 1));
   gtk_css_style_property_register        ("font-size",
                                           GTK_CSS_PROPERTY_FONT_SIZE,
                                           G_TYPE_DOUBLE,
@@ -899,8 +887,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
+                                          _gtk_css_color_value_new_rgba (0, 0, 0, 0));
 
   gtk_css_style_property_register        ("font-family",
                                           GTK_CSS_PROPERTY_FONT_FAMILY,
@@ -1197,9 +1184,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-right-color",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
                                           GDK_TYPE_RGBA,
@@ -1207,9 +1192,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-bottom-color",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
                                           GDK_TYPE_RGBA,
@@ -1217,9 +1200,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("border-left-color",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
                                           GDK_TYPE_RGBA,
@@ -1227,9 +1208,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
   gtk_css_style_property_register        ("outline-color",
                                           GTK_CSS_PROPERTY_OUTLINE_COLOR,
                                           GDK_TYPE_RGBA,
@@ -1237,9 +1216,7 @@ _gtk_css_style_property_init_properties (void)
                                           color_parse,
                                           color_query,
                                           color_assign,
-                                          _gtk_css_symbolic_value_new_take_symbolic_color (
-                                            gtk_symbolic_color_ref (
-                                              _gtk_symbolic_color_get_current_color ())));
+                                          _gtk_css_color_value_new_current_color ());
 
   gtk_css_style_property_register        ("background-repeat",
                                           GTK_CSS_PROPERTY_BACKGROUND_REPEAT,