symboliccolor: Parse 'currentColor' everywhere

2012-04-05 22:22:52 +02:00
parent 83be7e5dbd
commit 51da8cb263
5 changed files with 16 additions and 44 deletions
--- 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);
 }