diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-05-24 15:22:55 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-05-24 15:22:55 +0000 |
| commit | c3dbb4aed0c951c814b3bc090d9f1ba096302537 (patch) | |
| tree | a841f53ef1691b83711548012cc2abdb4bb83954 /plparse/totem-pl-parser-wm.c | |
| parent | bd7403da4ad99a0c07cf19cc273360fd661b0519 (diff) | |
| download | totem-pl-parser-c3dbb4aed0c951c814b3bc090d9f1ba096302537.tar.gz | |
Don't try to resolve absolute URIs
2008-05-24 Bastien Nocera <hadess@hadess.net>
* plparse/totem-pl-parser-private.h:
* plparse/totem-pl-parser-smil.c (parse_smil_entry):
* plparse/totem-pl-parser-wm.c (parse_asx_entry),
(parse_asx_entryref):
* plparse/totem-pl-parser-xspf.c (parse_xspf_track):
Don't try to resolve absolute URIs
* plparse/totem-pl-parser.c
(my_g_file_info_get_mime_type_with_data),
(totem_pl_parser_parse_internal): Revert code for the
block device detection, the GIO code wasn't working as expected (there
doesn't seem to be a way to detect whether a file is a block device
using GIO)
Also make sure we pass a base_file to parsing function, based on the
URL to parse, if we weren't provided one
* plparse/totem-pl-parser-podcast.c (totem_pl_parser_is_itms_feed):
Fix bad detection of the itms URI scheme
svn path=/trunk/; revision=132
Diffstat (limited to 'plparse/totem-pl-parser-wm.c')
| -rw-r--r-- | plparse/totem-pl-parser-wm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c index b36ce3c..8702fc1 100644 --- a/plparse/totem-pl-parser-wm.c +++ b/plparse/totem-pl-parser-wm.c @@ -260,7 +260,7 @@ parse_asx_entry (TotemPlParser *parser, GFile *base_file, xml_node_t *parent) return TOTEM_PL_PARSER_RESULT_ERROR; - if (base_file != NULL) + if (base_file != NULL && strstr (url, "://") == NULL) resolved = g_file_resolve_relative_path (base_file, url); else resolved = g_file_new_for_uri (url); @@ -298,7 +298,7 @@ parse_asx_entryref (TotemPlParser *parser, GFile *base_file, xml_node_t *node) if (url == NULL) return TOTEM_PL_PARSER_RESULT_ERROR; - if (base_file != NULL) + if (base_file != NULL && strstr (url, "://") == NULL) resolved = g_file_resolve_relative_path (base_file, url); else resolved = g_file_new_for_uri (url); |