X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcssimagevalue.c;h=dac0c2fac8cb974bf2db0c608ab02dc2afc19058;hb=a89d420270d1a856e072ed87c365b0176f102e6c;hp=b8baa509f2d7a2cc91ae0500d823ee1aa595be65;hpb=e3fc081c5dbb5ab04c8b0d3bd9aa52fe16aba640;p=~andy%2Fgtk

diff --git a/gtk/gtkcssimagevalue.c b/gtk/gtkcssimagevalue.c
index b8baa509f..dac0c2fac 100644
--- a/gtk/gtkcssimagevalue.c
+++ b/gtk/gtkcssimagevalue.c
@@ -34,10 +34,12 @@ gtk_css_value_image_free (GtkCssValue *value)
 }
 
 static GtkCssValue *
-gtk_css_value_image_compute (GtkCssValue        *value,
-                             guint               property_id,
-                             GtkStyleContext    *context,
-                             GtkCssDependencies *dependencies)
+gtk_css_value_image_compute (GtkCssValue             *value,
+                             guint                    property_id,
+                             GtkStyleProviderPrivate *provider,
+                             GtkCssComputedValues    *values,
+                             GtkCssComputedValues    *parent_values,
+                             GtkCssDependencies      *dependencies)
 {
   GtkCssImage *image, *computed;
   
@@ -46,7 +48,7 @@ gtk_css_value_image_compute (GtkCssValue        *value,
   if (image == NULL)
     return _gtk_css_value_ref (value);
 
-  computed = _gtk_css_image_compute (image, property_id, context, dependencies);
+  computed = _gtk_css_image_compute (image, property_id, provider, values, parent_values, dependencies);
 
   if (computed == image)
     {
@@ -61,7 +63,7 @@ static gboolean
 gtk_css_value_image_equal (const GtkCssValue *value1,
                            const GtkCssValue *value2)
 {
-  return value1->image == value2->image;
+  return _gtk_css_image_equal (value1->image, value2->image);
 }
 
 static GtkCssValue *
@@ -70,13 +72,14 @@ gtk_css_value_image_transition (GtkCssValue *start,
                                 guint        property_id,
                                 double       progress)
 {
-  GtkCssImage *fade;
+  GtkCssImage *transition;
 
-  fade = _gtk_css_image_cross_fade_new (_gtk_css_image_value_get_image (start),
-                                        _gtk_css_image_value_get_image (end),
-                                        progress);
+  transition = _gtk_css_image_transition (_gtk_css_image_value_get_image (start),
+                                          _gtk_css_image_value_get_image (end),
+                                          property_id,
+                                          progress);
       
-  return _gtk_css_image_value_new (fade);
+  return _gtk_css_image_value_new (transition);
 }
 
 static void