totem-pl-parser r131 - in trunk: . plparse

[hadess svn gnome org]

Author: hadess
Date: Sat May 24 12:30:13 2008
New Revision: 131
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=131&view=rev

Log:
2008-05-24  Bastien Nocera  <hadess hadess net>

	* plparse/totem-pl-parser.c (totem_pl_parser_parse_internal):
	When we have a base-file, use the file itself as the base
	for resolving relative paths, fixes parsing of
	http://localhost:12345/playlist.asx in the test suite



Modified:
   trunk/ChangeLog
   trunk/plparse/totem-pl-parser.c

Modified: trunk/plparse/totem-pl-parser.c
==============================================================================
--- trunk/plparse/totem-pl-parser.c	(original)
+++ trunk/plparse/totem-pl-parser.c	Sat May 24 12:30:13 2008
@@ -1477,7 +1477,8 @@
 					g_free (data);
 					return TOTEM_PL_PARSER_RESULT_IGNORED;
 				}
-				ret = (* special_types[i].func) (parser, file, base_file, data);
+				ret = (* special_types[i].func) (parser, file, base_file ? base_file : file, data);
+
 				found = TRUE;
 				break;
 			}
@@ -1496,7 +1497,7 @@
 						break;
 					}
 				}
-				ret = (* dual_types[i].func) (parser, file, base_file, data);
+				ret = (* dual_types[i].func) (parser, file, base_file ? base_file : file, data);
 				found = TRUE;
 				break;
 			}