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

[From: subversion at stage.maemo.org]

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

Modified:
   projects/haf/trunk/totem-pl-parser/ChangeLog
   projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c
Log:
2008-11-13 Bastien Nocera <hadess at hadess.net>

	* plparse/totem-pl-parser.c
	(my_g_file_info_get_mime_type_with_data),
	(totem_pl_parser_cleanup_xml): Fix _cleanup_xml to
	actually clean the comment closing bits ('-->')
	(Closes: #560051)

Modified: projects/haf/trunk/totem-pl-parser/ChangeLog
===================================================================
--- projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:25 UTC (rev 17103)
+++ projects/haf/trunk/totem-pl-parser/ChangeLog	2009-01-12 14:43:27 UTC (rev 17104)
@@ -1,3 +1,11 @@
+2008-11-13  Bastien Nocera  <hadess at hadess.net>
+
+	* plparse/totem-pl-parser.c
+	(my_g_file_info_get_mime_type_with_data),
+	(totem_pl_parser_cleanup_xml): Fix _cleanup_xml to
+	actually clean the comment closing bits ('-->')
+	(Closes: #560051)
+
 2008-11-10  Cosimo Cecchi  <cosimoc at gnome.org>
 
 	* plparse/totem-pl-parser.h: use single GTK+ includes.

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:25 UTC (rev 17103)
+++ projects/haf/trunk/totem-pl-parser/plparse/totem-pl-parser.c	2009-01-12 14:43:27 UTC (rev 17104)
@@ -671,13 +671,14 @@
 		g_error_free (error);
 		return NULL;
 	}
-	DEBUG(file, g_print ("URL '%s' was opened successfully in _get_mime_type_with_data:\n", uri));
+	DEBUG(file, g_print ("URL '%s' was opened successfully in _get_mime_type_with_data\n", uri));
 
 	/* Read the whole thing, up to MIME_READ_CHUNK_SIZE */
 	buffer = g_malloc (MIME_READ_CHUNK_SIZE);
 	bytes_read = g_input_stream_read (G_INPUT_STREAM (stream), buffer, MIME_READ_CHUNK_SIZE, NULL, &error);
 	g_object_unref (G_INPUT_STREAM (stream));
 	if (bytes_read == -1) {
+		DEBUG(file, g_print ("Couldn't read data from '%s'\n", uri));
 		g_free (buffer);
 		return NULL;
 	}
@@ -1381,6 +1382,11 @@
 			if (*needle == '\0')
 				break;
 		}
+		if (strncmp (needle, "-->", 3) == 0) {
+			guint i;
+			for (i = 0; i < 3; i++)
+				*(needle + i) = ' ';
+		}
 	}
 }