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

[hadess svn gnome org]

Author: hadess
Date: Tue May  6 09:16:30 2008
New Revision: 107
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=107&view=rev

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

	* plparse/xmllexer.c (lexer_get_token): Update from xine-lib 1.2
	branch, fixes trailing linefeeds in element names (Closes: #531676)
	* plparse/totem-pl-parser-podcast.c (totem_pl_parser_is_rss):
	Remove work-around for bug #522968



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

Modified: trunk/plparse/totem-pl-parser-podcast.c
==============================================================================
--- trunk/plparse/totem-pl-parser-podcast.c	(original)
+++ trunk/plparse/totem-pl-parser-podcast.c	Tue May  6 09:16:30 2008
@@ -42,7 +42,6 @@
 #include "totem-pl-parser-private.h"
 
 #define RSS_NEEDLE "<rss "
-#define RSS_NEEDLE2 "<rss\n"
 #define ATOM_NEEDLE "<feed "
 #define OPML_NEEDLE "<opml "
 
@@ -57,9 +56,6 @@
 	if (memmem (data, len,
 		    RSS_NEEDLE, strlen (RSS_NEEDLE)) != NULL)
 		return RSS_MIME_TYPE;
-	if (memmem (data, len,
-		    RSS_NEEDLE2, strlen (RSS_NEEDLE2)) != NULL)
-		return RSS_MIME_TYPE;
 
 	return NULL;
 }

Modified: trunk/plparse/xmllexer.c
==============================================================================
--- trunk/plparse/xmllexer.c	(original)
+++ trunk/plparse/xmllexer.c	Tue May  6 09:16:30 2008
@@ -443,6 +443,8 @@
 	  case '\"': /* " */
 	  case ' ':
 	  case '\t':
+	  case '\n':
+	  case '\r':
 	  case '=':
 	  case '/':
 	    tok[tok_pos] = '\0';