gtk-css-engine r199 - in trunk: . src

[robsta svn gnome org]

Author: robsta
Date: Tue Nov 25 13:47:21 2008
New Revision: 199
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=199&view=rev

Log:
* src/gce-functions.c (url), (color), (mix), (shade), (lighter),
(darker):
* src/gce-style.c (rectangle), (gap), (line):
Fix after ccss API changes (function user-data).



Modified:
   trunk/ChangeLog
   trunk/src/gce-functions.c
   trunk/src/gce-style.c

Modified: trunk/src/gce-functions.c
==============================================================================
--- trunk/src/gce-functions.c	(original)
+++ trunk/src/gce-functions.c	Tue Nov 25 13:47:21 2008
@@ -28,10 +28,11 @@
 #include "gce-color.h"
 
 /*
- * TODO make this bullet proof wrt uri scheme.
+ * FIXME: make this bullet proof wrt uri scheme.
  */
 static char *
-url (GSList const *args)
+url (GSList const	*args,
+     void		*user_data)
 {
 	char		*resolved_path;
 	char		*ret;
@@ -246,7 +247,8 @@
 }
 
 static char *
-color (GSList const *args)
+color (GSList const	*args,
+       void		*user_data)
 {
 	GdkColor	 result;
 	gboolean	 ret;
@@ -267,7 +269,8 @@
 }
 
 static char *
-mix (GSList const *args)
+mix (GSList const	*args,
+     void		*user_data)
 {
 	GSList const	*iter;
 	GdkColor	 result;
@@ -290,7 +293,8 @@
 }
 
 static char *
-shade (GSList const *args)
+shade (GSList const	*args,
+       void		*user_data)
 {
 	GSList const	*iter;
 	GdkColor	 result;
@@ -313,7 +317,8 @@
 }
 
 static char *
-lighter (GSList const *args)
+lighter (GSList const	*args,
+	 void		*user_data)
 {
 	GSList const	*iter;
 	GdkColor	 result;
@@ -336,7 +341,8 @@
 }
 
 static char *
-darker (GSList const *args)
+darker (GSList const	*args,
+	void		*user_data)
 {
 	GSList const	*iter;
 	GdkColor	 result;
@@ -360,12 +366,12 @@
 
 static ccss_function_t const _functions[] = 
 {
-  { "url",		url		},
-  { "gtk-color",	color		},
-  { "gtk-mix",		mix		},
-  { "gtk-shade",	shade		},
-  { "gtk-lighter",	lighter		},
-  { "gtk-darker",	darker		},
+  { "url",		url,		NULL },
+  { "gtk-color",	color,		NULL },
+  { "gtk-mix",		mix,		NULL },
+  { "gtk-shade",	shade,		NULL },
+  { "gtk-lighter",	lighter,	NULL },
+  { "gtk-darker",	darker,		NULL },
   { NULL }
 };
 

Modified: trunk/src/gce-style.c
==============================================================================
--- trunk/src/gce-style.c	(original)
+++ trunk/src/gce-style.c	Tue Nov 25 13:47:21 2008
@@ -73,9 +73,9 @@
 		}
 
 		if (fill) {
-			ccss_style_draw_rectangle (style, cr, x, y, width, height);
+			ccss_cairo_style_draw_rectangle (style, cr, x, y, width, height);
 		} else {
-			ccss_style_draw_outline (style, cr, x, y, width, height);
+			ccss_cairo_style_draw_outline (style, cr, x, y, width, height);
 		}
 
 		cairo_destroy (cr), cr = NULL;
@@ -121,7 +121,9 @@
 			height = height == -1 ? h : height;
 		}
 
-		ccss_style_draw_gap (style, cr, x, y, width, height, gap_side, gap_start, gap_width);
+		ccss_cairo_style_draw_rectangle_with_gap (style, cr, x, y,
+							  width, height,
+							  gap_side, gap_start, gap_width);
 
 		cairo_destroy (cr), cr = NULL;
 	}
@@ -155,7 +157,7 @@
 			cairo_clip (cr);
 		}
 
-		ccss_style_draw_line (style, cr, x1, x2, y1, y2);
+		ccss_cairo_style_draw_line (style, cr, x1, x2, y1, y2);
 
 		cairo_destroy (cr), cr = NULL;
 	}