From da25771e5861440cc487c4dab37b20f1a704557b Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 14 Feb 2015 02:27:39 +0100
Subject: cssvalue: Remove GtkCssDependencies

They are not used anymore.
---
 gtk/gtkstylecontext.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'gtk/gtkstylecontext.c')

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 19a057ee8f..2b9f490f6f 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1649,7 +1649,7 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
               else
                 g_value_init (&pcache->value, GDK_TYPE_COLOR);
 
-              if (_gtk_style_context_resolve_color (context, _gtk_symbolic_color_get_css_value (color), &rgba, NULL))
+              if (_gtk_style_context_resolve_color (context, _gtk_symbolic_color_get_css_value (color), &rgba))
                 {
                   if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_RGBA)
                     g_value_set_boxed (&pcache->value, &rgba);
@@ -2172,8 +2172,7 @@ gtk_style_context_get_junction_sides (GtkStyleContext *context)
 gboolean
 _gtk_style_context_resolve_color (GtkStyleContext    *context,
                                   GtkCssValue        *color,
-                                  GdkRGBA            *result,
-                                  GtkCssDependencies *dependencies)
+                                  GdkRGBA            *result)
 {
   GtkCssValue *val;
 
@@ -2184,8 +2183,6 @@ _gtk_style_context_resolve_color (GtkStyleContext    *context,
   val = _gtk_css_color_value_resolve (color,
                                       GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade),
                                       _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR),
-                                      GTK_CSS_DEPENDS_ON_COLOR,
-                                      dependencies,
                                       NULL);
   if (val == NULL)
     return FALSE;
@@ -2220,7 +2217,7 @@ gtk_style_context_lookup_color (GtkStyleContext *context,
   if (value == NULL)
     return FALSE;
 
-  return _gtk_style_context_resolve_color (context, value, color, NULL);
+  return _gtk_style_context_resolve_color (context, value, color);
 }
 
 /**
@@ -3250,7 +3247,6 @@ gtk_gradient_resolve_for_context (GtkGradient     *gradient,
                                   GtkStyleContext *context)
 {
   GtkStyleContextPrivate *priv = context->priv;
-  GtkCssDependencies ignored = 0;
 
   g_return_val_if_fail (gradient != NULL, NULL);
   g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
@@ -3258,7 +3254,6 @@ gtk_gradient_resolve_for_context (GtkGradient     *gradient,
   return _gtk_gradient_resolve_full (gradient,
                                      GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
                                      gtk_style_context_lookup_style (context),
-                                     priv->parent ? gtk_style_context_lookup_style (priv->parent) : NULL,
-                                     &ignored);
+                                     priv->parent ? gtk_style_context_lookup_style (priv->parent) : NULL);
 }
 
-- 
cgit v1.2.1