summaryrefslogtreecommitdiff
path: root/plparse/totem-pl-parser-wm.c
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2009-04-24 14:07:27 +0100
committerBastien Nocera <hadess@hadess.net>2009-04-24 14:07:27 +0100
commitf4352fd41386f5e31ad742cde30975d425925de7 (patch)
treec1d5c6b4b654b0f84c1eac77782c237b14929c2e /plparse/totem-pl-parser-wm.c
parent124d6b570060e7e1aded85e2b5f2b148b7693471 (diff)
downloadtotem-pl-parser-f4352fd41386f5e31ad742cde30975d425925de7.tar.gz
Bug 579993 – Doesn't handle encoding property in XML files
2009-04-24 Bastien Nocera <hadess@hadess.net> * plparse/totem-pl-parser.c (totem_pl_parser_parse_xml_relaxed): Implement XML parser helper which takes the XML encoding property into account to convert source contents * plparse/totem-pl-parser-podcast.c (totem_pl_parser_add_rss), (totem_pl_parser_add_atom), (totem_pl_parser_get_feed_uri), (totem_pl_parser_add_opml): * plparse/totem-pl-parser-private.h: * plparse/totem-pl-parser-qt.c (totem_pl_parser_add_quicktime_metalink): * plparse/totem-pl-parser-smil.c (totem_pl_parser_add_smil_with_data): * plparse/totem-pl-parser-wm.c (totem_pl_parser_add_asx): Use the XML parser helper (Closes: #579993)
Diffstat (limited to 'plparse/totem-pl-parser-wm.c')
-rw-r--r--plparse/totem-pl-parser-wm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c
index beae8d5..8a0692b 100644
--- a/plparse/totem-pl-parser-wm.c
+++ b/plparse/totem-pl-parser-wm.c
@@ -389,11 +389,12 @@ totem_pl_parser_add_asx (TotemPlParser *parser,
if (g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) == FALSE)
return TOTEM_PL_PARSER_RESULT_ERROR;
- xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
- if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0) {
+ doc = totem_pl_parser_parse_xml_relaxed (contents, size);
+ if (doc == NULL) {
g_free (contents);
return TOTEM_PL_PARSER_RESULT_ERROR;
}
+
/* If the document has no name */
if (doc->name == NULL
|| g_ascii_strcasecmp (doc->name , "asx") != 0) {