[cairo-commit] cairo/src cairo.c,1.105,1.106 cairo.h,1.128,1.129

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv20178/src

Modified Files:
	cairo.c cairo.h 
Log Message:

        * src/cairo.h:
        * src/cairo.c: Remove cairo_status_string function which can now
        be replaced by:

                cairo_status_to_string (cairo_status (cr));

        This allows consistent handling of status values for things like
        cairo_pattern_status where there is now
        cairo_pattern_status_string function.


Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- cairo.c	15 Jun 2005 17:46:49 -0000	1.105
+++ cairo.c	15 Jun 2005 17:52:01 -0000	1.106
@@ -2321,12 +2321,6 @@
     return "<unknown error status>";
 }
 
-const char *
-cairo_status_string (cairo_t *cr)
-{
-    return cairo_status_to_string (cr->status);
-}
-
 void
 _cairo_restrict_value (double *value, double min, double max)
 {

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- cairo.h	14 Jun 2005 18:58:14 -0000	1.128
+++ cairo.h	15 Jun 2005 17:52:01 -0000	1.129
@@ -884,9 +884,6 @@
 const char *
 cairo_status_to_string (cairo_status_t status);
 
-const char *
-cairo_status_string (cairo_t *cr);
-
 /* Surface manipulation */
 
 /**
@@ -1142,7 +1139,6 @@
 #define cairo_current_matrix         cairo_current_matrix_REPLACED_BY_cairo_get_matrix
 #define cairo_current_target_surface cairo_current_target_surface_REPLACED_BY_cairo_get_target
 #define cairo_get_status             cairo_get_status_REPLACED_BY_cairo_status
-#define cairo_get_status_string	     cairo_get_status_string_REPLACED_BY_cairo_status_string
 #define cairo_concat_matrix		 cairo_concat_matrix_REPLACED_BY_cairo_transform
 #define cairo_scale_font                 cairo_scale_font_REPLACED_BY_cairo_set_font_size
 #define cairo_select_font                cairo_select_font_REPLACED_BY_cairo_select_font_face
@@ -1191,6 +1187,8 @@
 #define cairo_set_target_win32		cairo_set_target_win32_DEPRECATED_BY_cairo_win32_surface_create
 #define cairo_set_target_xcb		cairo_set_target_xcb_DEPRECATED_BY_cairo_xcb_surface_create
 #define cairo_set_target_drawable	cairo_set_target_drawable_DEPRECATED_BY_cairo_xlib_surface_create
+#define cairo_get_status_string		cairo_get_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
+#define cairo_status_string		cairo_status_string_DEPRECATED_BY_cairo_status_AND_cairo_status_to_string
 
 #endif