--- a/ChangeLog	Mon Oct 11 18:27:14 2004 +0000
+++ b/ChangeLog	Tue Oct 12 10:35:42 2004 +0000
@@ -1,3 +1,10 @@
+2004-10-12  Balamurali Viswanathan  <[email protected]>
+
+	* gnome-media.spec: Update
+	* patches/gnome-media-12-play-pipeline.diff: Modify.
+	Don't do a g_object_set on the play pipeline in media_stop(),since 
+	play pipeline is created now in media_play(). Fixes bug #6176869
+
 2004-10-11  Brian Cameron  <[email protected]>
 
 	* gtkam.spec: Move gtkam-gimp plugin to lib/gimp/2.0.

--- a/gnome-media.spec	Mon Oct 11 18:27:14 2004 +0000
+++ b/gnome-media.spec	Tue Oct 12 10:35:42 2004 +0000
@@ -2,7 +2,7 @@
 Summary:      GNOME Multimedia
 Group:        System/GUI/GNOME
 Version:      2.6.1
-Release:      27
+Release:      28
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 License:      GPL
@@ -204,6 +204,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 12 2004 - [email protected]
+- Modify patch gnome-media-12-play-pipeline.diff to fix bug #6176869
+
 * Fri Oct 08 2004 - [email protected]
 - Added patch gnome-media-14-remove-unusable-cache-entry.diff to 
   remove the cache entry once it is stale. Fixed a leak, etc.

--- a/patches/gnome-media-12-play-pipeline.diff	Mon Oct 11 18:27:14 2004 +0000
+++ b/patches/gnome-media-12-play-pipeline.diff	Tue Oct 12 10:35:42 2004 +0000
@@ -1,5 +1,5 @@
---- gnome-media-2.6.1/grecord/src/gsr-window.c	2004-09-23 17:20:41.000000000 +0530
-+++ gnome-media-2.6.1-new/grecord/src/gsr-window.c	2004-09-23 18:48:54.000000000 +0530
+--- gnome-media-2.6.1/grecord/src/gsr-window.c	2004-10-11 23:54:04.000000000 -0700
++++ gnome-media-2.6.1-new/grecord/src/gsr-window.c	2004-10-11 23:55:17.000000000 -0700
 @@ -100,6 +100,7 @@ struct _GSRWindowPrivate {
  };
  
@@ -25,7 +25,19 @@
  	if (priv->record && gst_element_get_state (priv->record->pipeline) == GST_STATE_PLAYING) {
  		gst_element_set_state (priv->record->pipeline, GST_STATE_READY);
  	}
-@@ -1686,7 +1697,7 @@ gsr_window_init (GSRWindow *window)
+@@ -1007,9 +1018,8 @@ media_stop (BonoboUIComponent *uic,
+ 		g_free (priv->working_file);
+ 		priv->working_file = g_strdup (priv->record_filename);
+ 
+-		g_object_set (G_OBJECT (priv->play->src),
+-			      "location", priv->working_file,
+-			      NULL);
++		g_free (priv->filename);
++		priv->filename = g_strdup (priv->record_filename);
+ 
+ 		priv->dirty = TRUE;
+ 		priv->has_file = TRUE;
+@@ -1686,7 +1696,7 @@ gsr_window_init (GSRWindow *window)
  	bonobo_ui_component_thaw (priv->ui_component, NULL);
  
  	/* Make the pipelines */
@@ -34,7 +46,7 @@
  	priv->record = NULL; 
  
  	priv->len_secs = 0;
-@@ -1763,9 +1774,6 @@ gsr_window_set_property (GObject      *o
+@@ -1763,9 +1773,6 @@ gsr_window_set_property (GObject      *o
  		g_free (title);
  		g_free (short_name);