← Back to branch summary

~ubuntu-branches/ubuntu/maverick/totem-pl-parser/maverick

« back to all changes in this revision

Viewing changes to plparse/totem-pl-parser-smil.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge, Josselin Mouette, Sebastian Dröge
  • Date: 2009-05-18 17:38:08 UTC
  • mfrom: (1.1.20 upstream)
  • mto: (1.5.1 squeeze)
  • mto: This revision was merged to the branch mainline in revision 31.
  • Revision ID: james.westby@ubuntu.com-20090518173808-ve0i7iirzbyarsfk
Tags: 2.26.2-1
[ Josselin Mouette ]
* Build-depend on libglib2.0-doc to ensure proper xrefs.

[ Sebastian Dröge ]
* New upstream bugfix release.
* debian/control.in:
  + Update Standards-Version to 3.8.1.
  + Move debug package to Section debug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plparse/totem-pl-parser-smil.c
73
73
                        copyright = xml_parser_get_property (node, "copyright");
74
74
 
75
75
                        if (uri != NULL) {
 
76
                                char *resolved_uri;
76
77
                                GFile *resolved;
77
78
 
78
 
                                if (base_file != NULL && strstr (uri, "://") == NULL)
79
 
                                        resolved = g_file_resolve_relative_path (base_file, uri);
80
 
                                else
81
 
                                        resolved = g_file_new_for_uri (uri);
 
79
                                resolved_uri = totem_pl_parser_resolve_uri (base_file, uri);
 
80
                                resolved = g_file_new_for_uri (resolved_uri);
 
81
                                g_free (resolved_uri);
82
82
 
83
83
                                totem_pl_parser_add_uri (parser,
84
84
                                                         TOTEM_PL_PARSER_FIELD_FILE, resolved,
197
197
        xml_node_t* doc;
198
198
        TotemPlParserResult retval;
199
199
 
200
 
        xml_parser_init (contents, size, XML_PARSER_CASE_INSENSITIVE);
201
 
        if (xml_parser_build_tree_with_options (&doc, XML_PARSER_RELAXED | XML_PARSER_MULTI_TEXT) < 0)
 
200
        doc = totem_pl_parser_parse_xml_relaxed (contents, size);
 
201
        if (doc == NULL)
202
202
                return TOTEM_PL_PARSER_RESULT_ERROR;
203
203
 
204
204
        retval = totem_pl_parser_add_smil_with_doc (parser, file, base_file, doc);