From e2855502f2f2e701b96a2a7eee4cda8c374bcbb9 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Tue, 28 Feb 2006 14:10:36 -0800
Subject: [PATCH] Fix last piece of merge resolution missing from previous
 commit

---
 src/cairo-ps-surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 951e1d69c..f35f82391 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -1339,7 +1339,7 @@ _cairo_ps_surface_show_glyphs (void		     *abstract_surface,
     cairo_int_status_t status;
     cairo_path_fixed_t *path;
 
-    if (surface->mode == CAIRO_PAGINATED_MODE_ANALYZE) {
+    if (surface->paginated_mode == CAIRO_PAGINATED_MODE_ANALYZE) {
 	if (!pattern_operation_supported (op, source))
 	    return CAIRO_INT_STATUS_UNSUPPORTED;
 	return CAIRO_STATUS_SUCCESS;