[cairo-commit] 2 commits - src/cairo-gstate.c test/Makefile.am

[Behdad Esfahbod]

 src/cairo-gstate.c |    5 +----
 test/Makefile.am   |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f2db80bf9ef5c454da77beeb263193d46f6b3d8c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Aug 10 23:39:44 2008 -0400

    [gstate] Revert Check for NULL font_face in _cairo_gstate_set_font_face
    
    Revert commit b67d34e960fa07cfafb13e3a5b5b4a63cfb024d3.
    cairo_set_font_face() is documented to accept NULL to restore default
    font face.  Revert commit that made it reject NULL.

diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index bb05446..b1c4627 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -1473,10 +1473,7 @@ cairo_status_t
 _cairo_gstate_set_font_face (cairo_gstate_t    *gstate,
 			     cairo_font_face_t *font_face)
 {
-    if (font_face == NULL)
-	return CAIRO_STATUS_NULL_POINTER;
-
-    if (font_face->status)
+    if (font_face && font_face->status)
 	return font_face->status;
 
     if (font_face != gstate->font_face) {
commit e797f6791ec17b490e9cddf8eddc695ec1631e3c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Aug 10 23:39:28 2008 -0400

    [test/Makefil.am] Cosmetic

diff --git a/test/Makefile.am b/test/Makefile.am
index 0148f4e..ad8186a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -960,7 +960,7 @@ check-valgrind:
 NOLOG_TESTS_LOG = $(NOLOG_TESTS:=.log)
 
 $(NOLOG_TESTS_LOG):
-	echo dummy > $@
+	@echo dummy > $@
 
 index.html: $(srcdir)/make-html.pl $(TESTS:$(EXEEXT)=.log)
 	@echo Creating index.html