totem r5901 - in trunk: . src/backend

[hadess svn gnome org]

Author: hadess
Date: Tue Jan  6 14:26:46 2009
New Revision: 5901
URL: http://svn.gnome.org/viewvc/totem?rev=5901&view=rev

Log:
2009-01-06  Bastien Nocera  <hadess hadess net>

	* src/backend/bacon-video-widget-gst-0.10.c
	(bacon_video_widget_get_metadata_string):
	* src/backend/bacon-video-widget-xine.c
	(bacon_video_widget_get_metadata_string):
	Remove linefeeds from strings, and replace them by spaces
	(Closes: #566455)



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-gst-0.10.c
   trunk/src/backend/bacon-video-widget-xine.c

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c	(original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c	Tue Jan  6 14:26:46 2009
@@ -4288,6 +4288,10 @@
       g_assert_not_reached ();
     }
 
+  /* Remove line feeds */
+  if (string && strstr (string, "\n") != NULL)
+    g_strdelimit (string, "\n", ' ');
+
   if (res && string && g_utf8_validate (string, -1, NULL)) {
     g_value_take_string (value, string);
     GST_DEBUG ("%s = '%s'", get_metadata_type_name (type), string);

Modified: trunk/src/backend/bacon-video-widget-xine.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-xine.c	(original)
+++ trunk/src/backend/bacon-video-widget-xine.c	Tue Jan  6 14:26:46 2009
@@ -3813,6 +3813,10 @@
 	if (string != NULL && string[0] == '\0')
 		string = NULL;
 
+	/* Remove line feeds */
+	if (strstr (string, "\n") != NULL)
+		g_strdelimit (string, "\n", " ");
+
 	if (string != NULL)
 	{
 		if (g_utf8_validate (string, -1, NULL) == FALSE)