[cairo-commit] cairo-demo/cairo-candy ChangeLog, 1.2, 1.3 cairo-clock.c, 1.3, 1.4

[Mirco Müller]

Committed by: macslow

Update of /cvs/cairo/cairo-demo/cairo-candy
In directory kemper:/tmp/cvs-serv15077

Modified Files:
	ChangeLog cairo-clock.c 
Log Message:
Fixed formatting in ChangeLog and compile-errors in cairo-clock.c


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo-candy/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	27 Jan 2006 07:24:06 -0000	1.2
+++ ChangeLog	6 Jul 2006 02:36:49 -0000	1.3
@@ -1,17 +1,23 @@
+2006-07-06 Mirco Mueller <macslow at bangang.de>
+
+	* cairo-clock.c: Made cairo-clock compile again (updated rsvg_* calls)
+
+	* ChangeLog: Fixed some of the formatting
+
 2006-01-27 Mirco Mueller <macslow at bangang.de>
 
-        The cairo-clock.c now uses librsvg to load all parts of the clock as SVG
-        files. Some command-line paramters can now be use to alter the initial
-        behaviour of the clock. Overall performance is much better now!
+	The cairo-clock.c now uses librsvg to load all parts of the clock as SVG
+	files. Some command-line paramters can now be use to alter the initial
+	behaviour of the clock. Overall performance is much better now!
 
 2006-01-22 Mirco Mueller <macslow at bangang.de>
 
-        On request by Carl Worth I'm doing the initial commit of this ahead of
-        "schedule" so he has a few more bullets for his eye-candy-gun to fire at
-		the crowed during linux.conf.au 2006 (gee, I'm talking out of my @!#?
-        again :). I hope everybody will enjoy these early pretty-pixels. This
-        stuff lands at the usual place at cvs.cairographics.org. I think...
+	On request by Carl Worth I'm doing the initial commit of this ahead of
+	"schedule" so he has a few more bullets for his eye-candy-gun to fire at
+	the crowed during linux.conf.au 2006 (gee, I'm talking out of my @!#?
+	again :). I hope everybody will enjoy these early pretty-pixels. This
+	stuff lands at the usual place at cvs.cairographics.org. I think...
 
-            cvs.freedesktop.org:/cvs/cairo/cairo-demo/cairo-candy
+		cvs.freedesktop.org:/cvs/cairo/cairo-demo/cairo-candy
 
-        will be a good place for those to live.
+	will be a good place for those to live.

Index: cairo-clock.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo-candy/cairo-clock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-clock.c	27 Jan 2006 07:24:06 -0000	1.3
+++ cairo-clock.c	6 Jul 2006 02:36:49 -0000	1.4
@@ -196,9 +196,9 @@
 	cairo_save (g_pCairoContext);
 	cairo_set_operator (g_pCairoContext, CAIRO_OPERATOR_OVER);
 
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_DROP_SHADOW]);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_FACE]);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_MARKS]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_DROP_SHADOW], g_pCairoContext);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_FACE], g_pCairoContext);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_MARKS], g_pCairoContext);
 
 	cairo_save (g_pCairoContext);
 	cairo_translate (g_pCairoContext, fHalfX, fHalfY);
@@ -207,13 +207,13 @@
 	cairo_save (g_pCairoContext);
 	cairo_translate (g_pCairoContext, fShadowOffsetX, fShadowOffsetY);
 	cairo_rotate (g_pCairoContext, (M_PI/6.0f) * g_iHours);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_HOUR_HAND_SHADOW]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_HOUR_HAND_SHADOW], g_pCairoContext);
 	cairo_restore (g_pCairoContext);
 
 	cairo_save (g_pCairoContext);
 	cairo_translate (g_pCairoContext, fShadowOffsetX, fShadowOffsetY);
 	cairo_rotate (g_pCairoContext, (M_PI/30.0f) * g_iMinutes);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_MINUTE_HAND_SHADOW]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_MINUTE_HAND_SHADOW], g_pCairoContext);
 	cairo_restore (g_pCairoContext);
 
 	if (g_iEverySecond)
@@ -221,33 +221,33 @@
 		cairo_save (g_pCairoContext);
 		cairo_translate (g_pCairoContext, fShadowOffsetX, fShadowOffsetY);
 		cairo_rotate (g_pCairoContext, (M_PI/30.0f) * g_iSeconds);
-		rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_SECOND_HAND_SHADOW]);
+		rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_SECOND_HAND_SHADOW], g_pCairoContext);
 		cairo_restore (g_pCairoContext);
 	}
 
 	cairo_save (g_pCairoContext);
 	cairo_rotate (g_pCairoContext, (M_PI/6.0f) * g_iHours);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_HOUR_HAND]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_HOUR_HAND], g_pCairoContext);
 	cairo_restore (g_pCairoContext);
 
 	cairo_save (g_pCairoContext);
 	cairo_rotate (g_pCairoContext, (M_PI/30.0f) * g_iMinutes);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_MINUTE_HAND]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_MINUTE_HAND], g_pCairoContext);
 	cairo_restore (g_pCairoContext);
 
 	if (g_iEverySecond)
 	{
 		cairo_save (g_pCairoContext);
 		cairo_rotate (g_pCairoContext, (M_PI/30.0f) * g_iSeconds);
-		rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_SECOND_HAND]);
+		rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_SECOND_HAND], g_pCairoContext);
 		cairo_restore (g_pCairoContext);
 	}
 
 	cairo_restore (g_pCairoContext);
 
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_FACE_SHADOW]);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_GLASS]);
-	rsvg_cairo_render (g_pCairoContext, g_pSvgHandles[CLOCK_FRAME]);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_FACE_SHADOW], g_pCairoContext);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_GLASS], g_pCairoContext);
+	rsvg_handle_render_cairo (g_pSvgHandles[CLOCK_FRAME], g_pCairoContext);
 
 	cairo_restore (g_pCairoContext);
 }