[cairo-commit] cairo-demo/X11 cairo-demo-xcb.c, 1.2, 1.3 cairo-demo.c, 1.14, 1.15 cairo-spline.c, 1.13, 1.14

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/X11
In directory gabe:/tmp/cvs-serv21767/X11

Modified Files:
	cairo-demo-xcb.c cairo-demo.c cairo-spline.c 
Log Message:

        * Makefile: Don't build gtkcairo_slide directory by default.

        * X11/cairo-demo-xcb.c: (win_draw):
        * X11/cairo-demo.c: (win_draw):
        * X11/cairo-spline.c: (win_refresh): Track replacement of
        cairo_status_string by cairo_status_to_string.


Index: cairo-demo-xcb.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-demo-xcb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo-demo-xcb.c	17 May 2005 14:50:15 -0000	1.2
+++ cairo-demo-xcb.c	15 Jun 2005 18:07:35 -0000	1.3
@@ -266,7 +266,8 @@
     draw_broken_shapes(cr);
 */
     if (cairo_status(cr)) {
-	printf("Cairo is unhappy: %s\n", cairo_status_string(cr));
+	printf("Cairo is unhappy: %s\n",
+	       cairo_status_to_string(cairo_status(cr)));
 	exit(0);
     }
 

Index: cairo-demo.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-demo.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cairo-demo.c	17 May 2005 14:50:15 -0000	1.14
+++ cairo-demo.c	15 Jun 2005 18:07:35 -0000	1.15
@@ -264,8 +264,9 @@
 /*
     draw_broken_shapes(cr);
 */
-    if (cairo_status(cr)) {
-	printf("Cairo is unhappy: %s\n", cairo_status_string(cr));
+    if (cairo_status (cr)) {
+	printf("Cairo is unhappy: %s\n",
+	       cairo_status_to_string (cairo_status (cr)));
 	exit(0);
     }
 

Index: cairo-spline.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-spline.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cairo-spline.c	17 May 2005 14:50:15 -0000	1.13
+++ cairo-spline.c	15 Jun 2005 18:07:35 -0000	1.14
@@ -253,7 +253,8 @@
 
     status = cairo_status(cr);
     if (status) {
-	fprintf(stderr, "Cairo is unhappy: %s\n", cairo_status_string(cr));
+	fprintf(stderr, "Cairo is unhappy: %s\n",
+		cairo_status_to_string(status));
     }
 
     cairo_destroy(cr);