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

[hadess svn gnome org]

Author: hadess
Date: Thu Feb 21 14:04:00 2008
New Revision: 52
URL: http://svn.gnome.org/viewvc/totem-pl-parser?rev=52&view=rev

Log:
2008-02-21  Bastien Nocera  <hadess hadess net>

	* plparse/totem-pl-parser.c (totem_pl_parser_mimetype_is_ignored),
	(totem_pl_parser_parse_internal): Fix text/plain files getting
	added even though they don't have a proper playlist mime-type,
	spotted by Tim-Philipp MÃller



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	Thu Feb 21 14:04:00 2008
@@ -1400,7 +1400,6 @@
 	}
 
 	return FALSE;
-
 }
 
 /**
@@ -1574,6 +1573,12 @@
 				if (data == NULL) {
 					g_free (mimetype);
 					mimetype = my_gnome_vfs_get_mime_type_with_data (url, &data, parser);
+					/* If it's _still_ a text/plain, we don't want it */
+					if (strcmp (mimetype, "text/plain") == 0) {
+						g_free (mimetype);
+						mimetype = NULL;
+						break;
+					}
 				}
 				ret = (* dual_types[i].func) (parser, url, base, data);
 				found = TRUE;