[Commit] grrobot/src grr_board_view.c, 1.17, 1.18 grr_icon.c, 1.5, 1.6 grr_icon.h, 1.3, 1.4 grrobot.c, 1.18, 1.19

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/grrobot/src
In directory home.keithp.com:/tmp/cvs-serv22318/src

Modified Files:
	grr_board_view.c grr_icon.c grr_icon.h grrobot.c 
Log Message:
	* configure.in:
	* ltmain.sh:
	* src/grr_board_view.c:
	* src/grr_icon.c: (_grr_icon_init), (grr_icon_draw):
	* src/grr_icon.h:
	* src/grrobot.c:
	Switch from xsvg to svg-cairo


Index: grr_board_view.c
===================================================================
RCS file: /local/src/CVS/grrobot/src/grr_board_view.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- grr_board_view.c	11 Nov 2003 15:51:53 -0000	1.17
+++ grr_board_view.c	25 Dec 2003 21:17:29 -0000	1.18
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <cairo.h>
-#include <xsvg.h>
+#include <svg-cairo.h>
 
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>

Index: grr_icon.c
===================================================================
RCS file: /local/src/CVS/grrobot/src/grr_icon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- grr_icon.c	4 Sep 2003 15:17:44 -0000	1.5
+++ grr_icon.c	25 Dec 2003 21:17:29 -0000	1.6
@@ -127,7 +127,7 @@
 static rr_status_t
 _grr_icon_init (grr_icon_t *icon, char *name)
 {
-    xsvg_status_t status;
+    svg_cairo_status_t status;
     char *file, *buf;
     int buflen;
 
@@ -135,15 +135,15 @@
     icon->surface_width = 0;
     icon->surface_height = 0;
 
-    status = xsvg_create (&icon->xsvg);
+    status = svg_cairo_create (&icon->svg_cairo);
     if (status)
 	return RR_STATUS_NO_MEMORY;
 
     file = _grr_icon_find_file (name);
 
     if (file) {
-	status = xsvg_parse_file (icon->xsvg, file);
-	if (status == XSVG_STATUS_SUCCESS) {
+	status = svg_cairo_parse (icon->svg_cairo, file);
+	if (status == SVG_CAIRO_STATUS_SUCCESS) {
 	    free (file);
 	    return RR_STATUS_SUCCESS;
 	}
@@ -152,7 +152,7 @@
     }
 
     _grr_icon_find_buffer (name, &buf, &buflen);
-    status = xsvg_parse_buffer (icon->xsvg, buf, buflen);
+    status = svg_cairo_parse_buffer (icon->svg_cairo, buf, buflen);
     if (status) {
 	fprintf (stderr, "Error parsing built-in SVG icon for: %s\n", name);
 	return RR_STATUS_PARSE_ERROR;
@@ -225,11 +225,11 @@
 void
 grr_icon_draw (grr_icon_t *icon, cairo_t *xrs)
 {
-    xsvg_status_t status;
+    svg_cairo_status_t status;
 
-    status =  xsvg_render (icon->xsvg, xrs);
+    status =  svg_cairo_render (icon->svg_cairo, xrs);
     if (status) {
-	fprintf (stderr, "xsvg_render error\n");
+	fprintf (stderr, "svg_cairo_render error\n");
 	return;
     }
 }

Index: grr_icon.h
===================================================================
RCS file: /local/src/CVS/grrobot/src/grr_icon.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- grr_icon.h	23 Jul 2003 21:34:34 -0000	1.3
+++ grr_icon.h	25 Dec 2003 21:17:29 -0000	1.4
@@ -28,10 +28,10 @@
 #define GRR_ICON_H
 
 #include <rr.h>
-#include <xsvg.h>
+#include <svg-cairo.h>
 
 typedef struct grr_icon {
-    xsvg_t *xsvg;
+    svg_cairo_t *svg_cairo;
 
     cairo_surface_t *surface;
     int surface_width;

Index: grrobot.c
===================================================================
RCS file: /local/src/CVS/grrobot/src/grrobot.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- grrobot.c	11 Nov 2003 15:51:53 -0000	1.18
+++ grrobot.c	25 Dec 2003 21:17:29 -0000	1.19
@@ -1,4 +1,4 @@
-/* grrobot - Ricochet Robot using GTK+, libxsvg, and Cairo
+/* grrobot - Ricochet Robot using GTK+, libsvg-cairo, and cairo
  *
  * Copyright © 2003 Carl Worth
  *