- Require libxml2-2.6.5 and libxslt-1.1.4 for the dictionary stuff.

* configure.in:
- Require libxml2-2.6.5 and libxslt-1.1.4 for the dictionary stuff.

* src/yelp-toc-pager.c:
- Remove work-around for #131745, since we now require libxml2-2.6.5.

3 files changed, 10 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b1eebf78..d92f9778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-03  Shaun McCance  <shaunm@gnome.org>
+
+	* configure.in:
+	- Require libxml2-2.6.5 and libxslt-1.1.4 for the dictionary stuff.
+
+	* src/yelp-toc-pager.c:
+	- Remove work-around for #131745, since we now require libxml2-2.6.5.
+
 2004-02-24  Shaun McCance  <shaunm@gnome.org>
 
 	* configure.in:
diff --git a/configure.in b/configure.in
index 5871a804..082c2c8e 100644
--- a/configure.in
+++ b/configure.in
@@ -49,8 +49,8 @@ PKG_CHECK_MODULES(YELP,
 	libgnome-2.0 >= 2.0.2
 	libgnomeui-2.0 >= 1.103.0
 	libgtkhtml-2.0 >= 2.1.2
-	libxml-2.0 >= 2.6.0
-	libxslt >= 1.1.1
+	libxml-2.0 >= 2.6.5
+	libxslt >= 1.1.4
 	libexslt >= 0.8.1
 ])
 
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index 98238c0e..cef722bc 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -484,15 +484,6 @@ process_omf_pending (YelpTocPager *pager)
 			       XML_PARSE_NONET    );
     if (!omf_doc) {
 	g_warning (_("Could not load the OMF file '%s'."), file);
-	/* FIXME:
-	 * There is a bug in libxml2 (#131745) that prevents files from being
-	 * parsed with a parser context after that context has failed on any
-	 * single file.  To work around this, we'll free the parser and make
-	 * a new one.  Remove the next two lines once configure.in requires
-	 * a version of libxml2 that has the bug fixed.
-	 */
-	xmlFreeParserCtxt (priv->parser);
-	priv->parser = xmlNewParserCtxt ();
 	goto done;
     }