totem r5344 - in branches/gnome-2-22: . src/backend

[hadess svn gnome org]

Author: hadess
Date: Tue Apr  8 14:17:29 2008
New Revision: 5344
URL: http://svn.gnome.org/viewvc/totem?rev=5344&view=rev

Log:
2008-04-08  Bastien Nocera  <hadess hadess net>

	* NEWS: upd
	* configure.in: 2.22.1

	* src/backend/bacon-video-widget-xine.c
	(bacon_video_widget_strdupnv), (bacon_video_widget_get_mrls):
	xine-lib doesn't NULL terminate its string arrays, so do without
	(Closes: #526497)



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/NEWS
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/src/backend/bacon-video-widget-xine.c

Modified: branches/gnome-2-22/NEWS
==============================================================================
--- branches/gnome-2-22/NEWS	(original)
+++ branches/gnome-2-22/NEWS	Tue Apr  8 14:17:29 2008
@@ -1,5 +1,17 @@
 New features and significant updates in version...
 
+2.22.1:
+* Add audio/x-speex as a supported mime-type
+* Movie player:
+  - Fix crasher when trying to load (unsupported) audio CDs
+  - Fix the bug report script
+  - Check for required GStreamer plugins in the YouTube plugin
+* GStreamer backend:
+  - Fix a possible crash when forcing use of ximagesink (as is the case
+    for small videos on trailers.apple.com)
+* xine-lib backend:
+  - Fix potential crasher when copying MRLs from the engine
+
 2.22.0:
 
 * Update GTK+ requirement for the accessibility support

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Tue Apr  8 14:17:29 2008
@@ -2,7 +2,7 @@
 
 m4_define(totem_version_major, 2)
 m4_define(totem_version_minor, 22)
-m4_define(totem_version_micro, 0)
+m4_define(totem_version_micro, 1)
 
 AC_INIT([totem],
         [totem_version_major.totem_version_minor.totem_version_micro],

Modified: branches/gnome-2-22/src/backend/bacon-video-widget-xine.c
==============================================================================
--- branches/gnome-2-22/src/backend/bacon-video-widget-xine.c	(original)
+++ branches/gnome-2-22/src/backend/bacon-video-widget-xine.c	Tue Apr  8 14:17:29 2008
@@ -3497,6 +3497,20 @@
 	return BVW_CAN_PLAY_MISSING_PLUGINS;
 }
 
+static char *
+bacon_video_widget_strdupnv (const char **mrls, int num_mrls)
+{
+	guint i;
+	char **retval;
+
+	retval = g_new (gchar*, num_mrls + 1);
+	for (i = 0; i < num_mrls; i++)
+		retval[i] = g_strdup (mrls[i]);
+	retval[num_mrls] = NULL;
+
+	return retval;
+}
+
 char **
 bacon_video_widget_get_mrls (BaconVideoWidget *bvw,
 			     TotemDiscMediaType type,
@@ -3552,10 +3566,10 @@
 			return NULL;
 		/* The first channel can be the last channel played,
 		 * or a copy of the first one, ignore it */
-		return g_strdupv (mrls++);
+		return bacon_video_widget_strdupnv (mrls++, num_mrls - 1);
 	}
 
-	return g_strdupv (mrls);
+	return bacon_video_widget_strdupnv (mrls, num_mrls);
 }
 
 void