[evince/gnome-2-32] [pdf] Update to poppler api changes

[Jan-Joost Spanjers <jspanjers src gnome org>]

commit a957e416a397ecc2821f3a2b91ca3397783a1799
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Fri Sep 17 13:21:16 2010 +0200

    [pdf] Update to poppler api changes
    
    Linearized PopplerDocument property is now boolean rather than string.
    (cherry picked from commit f77e6cf4fd7fef49ac91d8c62b6a9a993529adb8)

 backend/pdf/ev-poppler.cc |   11 +++++++++++
 configure.ac              |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 03931a6..ed07eec 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -640,6 +640,9 @@ pdf_document_get_info (EvDocument *document)
 	PopplerPermissions permissions;
 	EvPage *page;
 	char *metadata;
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+	gboolean linearized;
+#endif
 
 	info = g_new0 (EvDocumentInfo, 1);
 
@@ -676,7 +679,11 @@ pdf_document_get_info (EvDocument *document)
 		      "producer", &(info->producer),
 		      "creation-date", &(info->creation_date),
 		      "mod-date", &(info->modified_date),
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+		      "linearized", &linearized,
+#else
 		      "linearized", &(info->linearized),
+#endif
 		      "metadata", &metadata,
 		      NULL);
 
@@ -782,6 +789,10 @@ pdf_document_get_info (EvDocument *document)
 		info->security = g_strdup (_("No"));
 	}
 
+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
+	info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
+#endif
+
 	return info;
 }
 
diff --git a/configure.ac b/configure.ac
index d061c2e..4bf438d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -505,6 +505,7 @@ if test "x$enable_pdf" = "xyes"; then
 	    AC_CHECK_FUNCS(poppler_page_get_text_layout)
 	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
 	    AC_CHECK_FUNCS(poppler_page_add_annot)
+	    AC_CHECK_FUNCS(poppler_document_is_linearized)
 	    LIBS=$evince_save_LIBS
 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
 	    if test x$enable_cairo_pdf = xyes; then