← Back to branch summary

~ubuntu-branches/ubuntu/maverick/liferea/maverick

« back to all changes in this revision

Viewing changes to src/xml.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2008-12-17 20:43:04 UTC
  • mfrom: (1.2.54 upstream)
  • Revision ID: james.westby@ubuntu.com-20081217204304-7p9cbrtiqtlryz60
Tags: 1.4.23-0ubuntu1
https://launchpad.net/bugs/309108
https://launchpad.net/bugs/291185
* New upstream bugfix release (lp: #309108).
  - Fixes a cache limit bug when merging items of feeds with
    more items than the cache allows (lp: #291185).
* debian/patches/series:
  - don't apply lua5.1.pc, we use lua5.0.
* debian/patches/fix_toggle_status_menu:
  - Removed, applied upstream.
* debian/patches/fix_launcher_script_calling_xul:
  - Removed, not needed anymore.
* debian/patches/01_ubuntu_feedlists,
  debian/patches/hildon_frothing:
  - Updated to apply again.
* debian/patches/xulrunner-1.9:
  - Updated for the new code.
* debian/patches/90_autoreconf:
  - New patch, generated by running autoreconf -fiv
* debian/patches/99_autoconf:
  - Removed, obsoleted by 90_autoreconf.
* debian/rules:
  - Don't disable gecko; enable it and check for libxul-embedding to build
    the Xulrunner engine. Don't enable xulrunner anymore, as it's now done
    via --enable-gecko.
* debian/patches/load_proper_xulrunner:
  - Patch from Fabien Tassin to load the appropriate Xulrunner version.
    This is a replacement for fix_launcher_script_calling_xul patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xml.c
519
519
        errors = g_new0 (struct errorCtxt, 1);
520
520
        errors->msg = fpc->feed->parseErrors;
521
521
        
522
 
        if (!g_utf8_validate (fpc->data, -1, NULL)) {
523
 
                /* We never collect invalid encoding error output to avoid getting
524
 
                   nasty characters inside our error buffer, so we issue a simple
525
 
                   warning here */
526
 
                debug1 (DEBUG_PARSING, "xml_parse_feed(): invalid UTF-8 encoding while parsing \"%s\"!", fpc->subscription->node->title);
527
 
                g_string_append_printf (fpc->feed->parseErrors, _("Invalid encoding in feed \"%s\"!"), fpc->subscription->node->title);
528
 
        }
529
 
        
530
522
        fpc->doc = xml_parse (fpc->data, (size_t)fpc->dataLength, fpc->recovery, errors);
531
523
        if (!fpc->doc) {
532
 
                debug1 (DEBUG_PARSING, "xmlReadMemory: could not parse feed \"%s\"!", fpc->subscription->node->title);
 
524
                debug1 (DEBUG_PARSING, "xml_parser_feed(): could not parse feed \"%s\"!", fpc->subscription->node->title);
533
525
                g_string_prepend (fpc->feed->parseErrors, _("XML Parser: Could not parse document:\n"));
534
526
                g_string_append (fpc->feed->parseErrors, "\n");
535
527
        }