[gtk+] Drop support for symbolic colors

[Matthias Clasen <matthiasc src gnome org>]

commit 1410031e5741e214e04bd9cc8dda6eb41877c3fb
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 7 14:43:49 2016 -0500

    Drop support for symbolic colors
    
    -gtk-gradient was the last internal user of this code, so
    we can drop it now.

 gtk/Makefile.am                          |    2 +-
 gtk/deprecated/Makefile.inc              |    9 +-
 gtk/deprecated/gtksymboliccolor.c        |  347 ------------------------------
 gtk/deprecated/gtksymboliccolor.h        |   68 ------
 gtk/deprecated/gtksymboliccolorprivate.h |   33 ---
 gtk/gtk.h                                |    4 -
 gtk/gtkcssstylefuncs.c                   |   93 --------
 gtk/gtkstylecontext.c                    |   30 ---
 8 files changed, 4 insertions(+), 582 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 91cd99c..34bfab7 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1343,7 +1343,7 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
        && rm -f xgen-gptbc
 
 
-gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h 
$(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
+gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h 
$(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtk.h>') > xgen-gtfsrc.c && \
          echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
          ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index f8bedfe..502df48 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -1,8 +1,5 @@
-deprecated_h_sources =                         \
-       deprecated/gtksymboliccolor.h
+deprecated_h_sources =
 
-deprecated_private_h_sources =                 \
-       deprecated/gtksymboliccolorprivate.h
+deprecated_private_h_sources =
 
-deprecated_c_sources =                         \
-       deprecated/gtksymboliccolor.c
+deprecated_c_sources =
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 89b927b..a3f903d 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -241,10 +241,6 @@
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkwindowgroup.h>
 
-#ifndef GTK_DISABLE_DEPRECATED
-#include <gtk/deprecated/gtksymboliccolor.h>
-#endif /* GTK_DISABLE_DEPRECATED */
-
 #include <gtk/gtk-autocleanups.h>
 
 #undef __GTK_H_INSIDE__
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index bd1e839..1fe9108 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -36,7 +36,6 @@
 #include "gtktypebuiltins.h"
 #include "gtkcsswin32sizevalueprivate.h"
 
-#include "deprecated/gtksymboliccolorprivate.h"
 
 /* this is in case round() is not provided by the compiler, 
  * such as in the case of C89 compilers, like MSVC
@@ -122,86 +121,6 @@ enum_print (int         value,
   g_type_class_unref (enum_class);
 }
 
-static gboolean
-rgba_value_parse (GtkCssParser *parser,
-                  GValue       *value)
-{
-  GtkSymbolicColor *symbolic;
-  GdkRGBA rgba;
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  symbolic = _gtk_css_symbolic_value_new (parser);
-  if (symbolic == NULL)
-    return FALSE;
-
-  if (gtk_symbolic_color_resolve (symbolic, &rgba))
-    {
-      g_value_set_boxed (value, &rgba);
-      gtk_symbolic_color_unref (symbolic);
-    }
-  else
-    {
-      g_value_unset (value);
-      g_value_init (value, GTK_TYPE_SYMBOLIC_COLOR);
-      g_value_take_boxed (value, symbolic);
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return TRUE;
-}
-
-static void
-rgba_value_print (const GValue *value,
-                  GString      *string)
-{
-  const GdkRGBA *rgba = g_value_get_boxed (value);
-
-  if (rgba == NULL)
-    g_string_append (string, "none");
-  else
-    {
-      char *s = gdk_rgba_to_string (rgba);
-      g_string_append (string, s);
-      g_free (s);
-    }
-}
-
-static gboolean
-symbolic_color_value_parse (GtkCssParser *parser,
-                            GValue       *value)
-{
-  GtkSymbolicColor *symbolic;
-
-  symbolic = _gtk_css_symbolic_value_new (parser);
-  if (symbolic == NULL)
-    return FALSE;
-
-  g_value_take_boxed (value, symbolic);
-  return TRUE;
-}
-
-static void
-symbolic_color_value_print (const GValue *value,
-                            GString      *string)
-{
-  GtkSymbolicColor *symbolic = g_value_get_boxed (value);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  if (symbolic == NULL)
-    g_string_append (string, "none");
-  else
-    {
-      char *s = gtk_symbolic_color_to_string (symbolic);
-      g_string_append (string, s);
-      g_free (s);
-    }
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-}
-
 static gboolean 
 font_description_value_parse (GtkCssParser *parser,
                               GValue       *value)
@@ -695,18 +614,6 @@ gtk_css_style_funcs_init (void)
   parse_funcs = g_hash_table_new (NULL, NULL);
   print_funcs = g_hash_table_new (NULL, NULL);
 
-  register_conversion_function (GDK_TYPE_RGBA,
-                                rgba_value_parse,
-                                rgba_value_print);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-  register_conversion_function (GTK_TYPE_SYMBOLIC_COLOR,
-                                symbolic_color_value_parse,
-                                symbolic_color_value_print);
-
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
   register_conversion_function (PANGO_TYPE_FONT_DESCRIPTION,
                                 font_description_value_parse,
                                 font_description_value_print);
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 6b2eb19..64641f8 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -55,9 +55,6 @@
 #include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
 
-#include "deprecated/gtksymboliccolorprivate.h"
-
-#include "fallback-c89.c"
 
 /**
  * SECTION:gtkstylecontext
@@ -1392,33 +1389,6 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
                                                  gtk_widget_path_iter_get_state (path, -1),
                                                  pspec, &pcache->value))
         {
-          G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
-          /* Resolve symbolic colors to GdkRGBA */
-          if (G_VALUE_TYPE (&pcache->value) == GTK_TYPE_SYMBOLIC_COLOR)
-            {
-              GtkSymbolicColor *color;
-              GdkRGBA rgba;
-
-              color = g_value_dup_boxed (&pcache->value);
-
-              g_value_unset (&pcache->value);
-
-              g_assert (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_RGBA);
-              g_value_init (&pcache->value, GDK_TYPE_RGBA);
-
-              if (_gtk_style_context_resolve_color (context, _gtk_symbolic_color_get_css_value (color), 
&rgba))
-                g_value_set_boxed (&pcache->value, &rgba);
-              else
-                g_param_value_set_default (pspec, &pcache->value);
-
-              gtk_symbolic_color_unref (color);
-            }
-
-          G_GNUC_END_IGNORE_DEPRECATIONS;
-
-          gtk_widget_path_unref (path);
-
           return &pcache->value;
         }
     }