diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2003-12-01 02:13:45 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2003-12-01 02:13:45 +0000 |
| commit | aaae59239520af386273f64201d1473d73fc29ba (patch) | |
| tree | 86fb2fc7e5ed5cc02e055f71e85916e6059febf3 | |
| parent | 4c42fa1b275f1530a9ff431d9b61c9f887957dbd (diff) | |
| download | yelp-aaae59239520af386273f64201d1473d73fc29ba.tar.gz | |
- Some work on the TOC.
* data/toc.xml.in:
- Some work on the TOC.
* src/yelp-db-pager.c:
- Actually use the parser options.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | data/toc.xml.in | 5 | ||||
| -rw-r--r-- | src/yelp-db-pager.c | 14 |
3 files changed, 19 insertions, 8 deletions
@@ -1,6 +1,14 @@ 2003-11-30 Shaun McCance <shaunm@gnome.org> * data/toc.xml.in: + - Some work on the TOC. + + * src/yelp-db-pager.c: + - Actually use the parser options. + +2003-11-30 Shaun McCance <shaunm@gnome.org> + + * data/toc.xml.in: - Implementing more of the TOC. * src/yelp-toc-pager.c: diff --git a/data/toc.xml.in b/data/toc.xml.in index 06cc4f67..edd31edc 100644 --- a/data/toc.xml.in +++ b/data/toc.xml.in @@ -6,6 +6,7 @@ <_title>Desktop</_title> <category>GNOME|Core Desktop</category> + <category>GNOME|Desktop</category> </toc> <toc id="Games"> @@ -25,8 +26,8 @@ <category>GNOME|Games</category> </toc> - <toc id="Education Applications"> - <_title>Education</_title> + <toc id="Education"> + <_title>Education Applications</_title> <category>Applications|Education</category> <category>Applications|Eduction|Arts</category> diff --git a/src/yelp-db-pager.c b/src/yelp-db-pager.c index f5e61d59..491646ad 100644 --- a/src/yelp-db-pager.c +++ b/src/yelp-db-pager.c @@ -214,12 +214,14 @@ db_pager_process (YelpPager *pager) yelp_toc_pager_pause (yelp_toc_pager_get ()); ctxt = xmlNewParserCtxt (); - xmlCtxtUseOptions (ctxt, - XML_PARSE_NOENT | - XML_PARSE_DTDLOAD | - XML_PARSE_XINCLUDE | - XML_PARSE_NONET ); - doc = xmlCtxtReadFile (ctxt, (const char *) uri_str, NULL, 0); + doc = xmlCtxtReadFile (ctxt, + (const char *) uri_str, + NULL, + XML_PARSE_DTDLOAD | + XML_PARSE_XINCLUDE | + XML_PARSE_NOCDATA | + XML_PARSE_NOENT | + XML_PARSE_NONET ); if (doc == NULL) { gchar *str_uri = yelp_uri_to_string (uri); |