Fix to return &_cairo_font_face_nil instead of NULL on error.

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a4d3942..630ca003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-06  Carl Worth  <cworth@cworth.org>
+
+	* src/cairo.c (cairo_get_font_face): Fix to return
+	&_cairo_font_face_nil instead of NULL on error.
+
 2005-08-06  Jeff Muizelaar  <jeff@infidigm.net>
 
 	* test/a8-mask.c: (main): Give reason for failure.
diff --git a/src/cairo.c b/src/cairo.c
index f0eebab9..05c87a42 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -1687,16 +1687,13 @@ cairo_get_font_face (cairo_t *cr)
 
     if (cr->status) {
 	_cairo_set_error (cr, cr->status);
-	return NULL;
+	return (cairo_font_face_t*) &_cairo_font_face_nil;
     }
 
     cr->status = _cairo_gstate_get_font_face (cr->gstate, &font_face);
     if (cr->status) {
 	_cairo_set_error (cr, cr->status);
-	/* XXX: When available:
-	return _cairo_font_face_nil;
-	*/
-	return NULL;
+	return (cairo_font_face_t*) &_cairo_font_face_nil;
     }
 
     return font_face;