diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-05-08 16:16:28 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-05-08 16:16:28 +0000 |
| commit | 6b1c5ac0867eefa4d78ce5d7929b75cd84ed22c7 (patch) | |
| tree | 61194a2fad9cca2685525ca23d17ff4405c4b6ca /plparse/totem-pl-parser-wm.c | |
| parent | 1a9a428a0ec27ec9b7ab36b602c9b47fb347faf6 (diff) | |
| download | totem-pl-parser-6b1c5ac0867eefa4d78ce5d7929b75cd84ed22c7.tar.gz | |
Remove debug
2008-05-08 Bastien Nocera <hadess@hadess.net>
* plparse/totem-pl-parser-podcast.c (totem_pl_parser_add_rss):
Remove debug
* plparse/totem-pl-parser-smil.c (parse_smil_entry):
* plparse/totem-pl-parser-xspf.c (parse_xspf_track):
* plparse/totem-pl-parser-wm.c (parse_asx_entry),
(parse_asx_entryref): Fix use of g_file_resolve_relative_path
when there's no base_file
* plparse/totem-pl-parser.c
(my_g_file_info_get_mime_type_with_data),
(totem_pl_parser_add_url_valist),
(totem_pl_parser_ignore_from_mimetype):
Only unref the info we get from the file if there's actually info
(ie. don't warn on non-existant files)
Don't unref file and base_file in _add_url_valist, as those
aren't ref'ed for us
Don't ignore files for which we can't get a mime-type
Fixes warning running the test-parser test-suite
svn path=/trunk/; revision=119
Diffstat (limited to 'plparse/totem-pl-parser-wm.c')
| -rw-r--r-- | plparse/totem-pl-parser-wm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c index 6c9ad7e..b36ce3c 100644 --- a/plparse/totem-pl-parser-wm.c +++ b/plparse/totem-pl-parser-wm.c @@ -260,7 +260,10 @@ parse_asx_entry (TotemPlParser *parser, GFile *base_file, xml_node_t *parent) return TOTEM_PL_PARSER_RESULT_ERROR; - resolved = g_file_resolve_relative_path (base_file, url); + if (base_file != NULL) + resolved = g_file_resolve_relative_path (base_file, url); + else + resolved = g_file_new_for_uri (url); /* .asx files can contain references to other .asx files */ retval = totem_pl_parser_parse_internal (parser, resolved, NULL); @@ -295,7 +298,10 @@ parse_asx_entryref (TotemPlParser *parser, GFile *base_file, xml_node_t *node) if (url == NULL) return TOTEM_PL_PARSER_RESULT_ERROR; - resolved = g_file_resolve_relative_path (base_file, url); + if (base_file != NULL) + resolved = g_file_resolve_relative_path (base_file, url); + else + resolved = g_file_new_for_uri (url); /* .asx files can contain references to other .asx files */ retval = totem_pl_parser_parse_internal (parser, resolved, NULL); |