[maemo-commits] [maemo-commits] r17120 - in projects/haf/trunk/totem-pl-parser: . plparse

[From: subversion at stage.maemo.org]

Author: ifrade
Date: 2009-01-12 16:43:52 +0200 (Mon, 12 Jan 2009)
New Revision: 17120

Modified:
   projects/haf/trunk/totem-pl-parser/ChangeLog
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
Log:
2009-01-05 Bastien Nocera <hadess at hadess.net>

	* plparse/totem-pl-parser.c (totem_pl_parser_parse_internal):
	Also ignore RTMP:// URIs

Modified: projects/haf/trunk/totem-pl-parser/ChangeLog
===================================================================
--- projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:51 UTC (rev 17119)
+++ projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:52 UTC (rev 17120)
@@ -1,3 +1,8 @@
+2009-01-05  Bastien Nocera  <hadess at hadess.net>
+
+	* plparse/totem-pl-parser.c (totem_pl_parser_parse_internal):
+	Also ignore RTMP:// URIs
+
 2009-01-03  Pascal Terjan <pterjan at linuxfr.org>
 
 	* plparse/totem-pl-parser-xspf.c: Fix memory leaks in 

Modified: projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
===================================================================
--- projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-12 14:43:51 UTC (rev 17119)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-12 14:43:52 UTC (rev 17120)
@@ -1443,9 +1443,10 @@
 
 	if (g_file_has_uri_scheme (file, "mms") != FALSE
 			|| g_file_has_uri_scheme (file, "rtsp") != FALSE
+			|| g_file_has_uri_scheme (file, "rtmp") != FALSE
 			|| g_file_has_uri_scheme (file, "icy") != FALSE
 			|| g_file_has_uri_scheme (file, "pnm") != FALSE) {
-		DEBUG(file, g_print ("URI '%s' is MMS, RTSP, PNM or ICY, not a playlist\n", uri));
+		DEBUG(file, g_print ("URI '%s' is MMS, RTSP, RTMP, PNM or ICY, not a playlist\n", uri));
 		return TOTEM_PL_PARSER_RESULT_UNHANDLED;
 	}