Cleanup usage of URL/URI/MRL in the playlist parser. Note that this

2008-12-05  Philip Withnall  <philip@tecnocode.co.uk>

	* docs/reference/totem-pl-parser-sections.txt:
	* plparse/disc-test.c (main):
	* plparse/test-parser.c (test_relative_real),
	(entry_metadata_foreach), (test_parsing_real),
	(test_data_get_data), (main):
	* plparse/totem-disc.c (totem_cd_detect_type_from_dir),
	(totem_cd_detect_type_with_url):
	* plparse/totem-disc.h:
	* plparse/totem-pl-parser-lines.c (totem_pl_parser_uri_to_dos),
	(totem_pl_parser_write_m3u), (totem_pl_parser_parse_ram_uri),
	(totem_pl_parser_add_ram), (totem_pl_parser_add_m3u):
	* plparse/totem-pl-parser-media.c (totem_pl_parser_add_iso),
	(totem_pl_parser_add_cue), (totem_pl_parser_add_directory),
	(totem_pl_parser_add_block):
	* plparse/totem-pl-parser-misc.c (totem_pl_parser_add_gvp):
	* plparse/totem-pl-parser-pla.c (totem_pl_parser_add_pla):
	* plparse/totem-pl-parser-pls.c (totem_pl_parser_write_pls),
	(totem_pl_parser_add_pls_with_contents):
	* plparse/totem-pl-parser-podcast.c (parse_rss_item),
	(parse_rss_items), (totem_pl_parser_add_rss),
	(totem_pl_parser_add_itpc), (totem_pl_parser_add_zune),
	(parse_atom_entry), (parse_atom_entries),
	(totem_pl_parser_add_atom), (totem_pl_parser_get_feed_uri),
	(totem_pl_parser_get_itms_uri), (totem_pl_parser_add_itms),
	(totem_pl_parser_is_itms_feed), (parse_opml_outline),
	(parse_opml_head_body), (totem_pl_parser_add_opml):
	* plparse/totem-pl-parser-private.h:
	* plparse/totem-pl-parser-qt.c
	(totem_pl_parser_add_quicktime_rtsptext),
	(totem_pl_parser_add_quicktime_metalink),
	(totem_pl_parser_add_quicktime):
	* plparse/totem-pl-parser-smil.c (parse_smil_entry):
	* plparse/totem-pl-parser-wm.c
	(totem_pl_parser_add_asf_reference_parser),
	(totem_pl_parser_add_asf_parser), (parse_asx_entry),
	(parse_asx_entryref), (parse_asx_entries),
	(totem_pl_parser_add_asx):
	* plparse/totem-pl-parser-xspf.c (totem_pl_parser_write_xspf),
	(parse_xspf_track):
	* plparse/totem-pl-parser.c (totem_pl_parser_class_init),
	(my_g_file_info_get_mime_type_with_data),
	(totem_pl_parser_base_uri), (totem_pl_parser_num_entries),
	(totem_pl_parser_add_uri_valist), (totem_pl_parser_add_uri),
	(totem_pl_parser_add_one_uri), (totem_pl_parser_add_one_file),
	(totem_pl_parser_scheme_is_ignored), (totem_pl_parser_ignore),
	(totem_pl_parser_parse_internal),
	(totem_pl_parser_parse_with_base), (totem_pl_parser_parse):
	* plparse/totem-pl-parser.h: Cleanup usage of URL/URI/MRL in the
	playlist parser. Note that this doesn't break API. (Closes: #536107)


svn path=/trunk/; revision=263

1 files changed, 2 insertions, 2 deletions

diff --git a/plparse/totem-pl-parser-pla.c b/plparse/totem-pl-parser-pla.c
index f1564c4..30175e6 100644
--- a/plparse/totem-pl-parser-pla.c
+++ b/plparse/totem-pl-parser-pla.c
@@ -177,7 +177,7 @@ totem_pl_parser_add_pla (TotemPlParser *parser,
 	if (contents[TITLE_OFFSET] != '\0')
 	{
 		title = contents + TITLE_OFFSET;
-		totem_pl_parser_add_url (parser,
+		totem_pl_parser_add_uri (parser,
 					 TOTEM_PL_PARSER_FIELD_IS_PLAYLIST, TRUE,
 					 TOTEM_PL_PARSER_FIELD_FILE, file,
 					 TOTEM_PL_PARSER_FIELD_TITLE, title,
@@ -216,7 +216,7 @@ totem_pl_parser_add_pla (TotemPlParser *parser,
 			break;
 		}
 
-		totem_pl_parser_add_url (parser, TOTEM_PL_PARSER_FIELD_URL, uri, NULL);
+		totem_pl_parser_add_uri (parser, TOTEM_PL_PARSER_FIELD_URI, uri, NULL);
 
 		g_free (uri);
 		g_free (path);