r17257 - in /packages/unstable/rhythmbox/debian: changelog patches/02_pause_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Oct 13 08:41:58 2008
New Revision: 17257

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17257
Log:
02_pause_crash.patch: new patch, stolen from upstream. Fixes crashes 
when pausing MP3 playback. Closes: #501944.

Added:
    packages/unstable/rhythmbox/debian/patches/02_pause_crash.patch
Modified:
    packages/unstable/rhythmbox/debian/changelog

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=17257&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog (original)
+++ packages/unstable/rhythmbox/debian/changelog Mon Oct 13 08:41:58 2008
@@ -1,7 +1,12 @@
 rhythmbox (0.11.6-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Fix super old libgnome2-dev bdep to use -1~ instead of -1; it's likely
     that the Debian revision isn't needed, but I can't tell from history.
+
+  [ Josselin Mouette ]
+  * 02_pause_crash.patch: new patch, stolen from upstream. Fixes crashes 
+    when pausing MP3 playback. Closes: #501944.
 
  -- Loic Minier <lool at dooz.org>  Wed, 03 Sep 2008 11:45:10 +0200
 

Added: packages/unstable/rhythmbox/debian/patches/02_pause_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/02_pause_crash.patch?rev=17257&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/02_pause_crash.patch (added)
+++ packages/unstable/rhythmbox/debian/patches/02_pause_crash.patch Mon Oct 13 08:41:58 2008
@@ -1,0 +1,39 @@
+Debian #501944
+GNOME #553677
+Upstream commit r5877
+
+--- trunk/backends/gstreamer/rb-player-gst-xfade.c	2008/09/02 22:06:23	5876
++++ trunk/backends/gstreamer/rb-player-gst-xfade.c	2008/09/02 22:22:10	5877
+@@ -1219,6 +1219,14 @@
+ 	}
+ }
+ 
++static gboolean
++perform_seek_idle (RBXFadeStream *stream)
++{
++	perform_seek (stream);
++	g_object_unref (stream);
++	return FALSE;
++}
++
+ /*
+  * called when a stream doing a post-EOS seek is blocked.  this indicates
+  * that the seek has completed (that's the only way data can flow out of
+@@ -1270,7 +1278,7 @@
+ 	/* handle unlinks for seeking and stream reuse */
+ 	switch (stream->state) {
+ 	case SEEKING:
+-		perform_seek (stream);
++		g_idle_add ((GSourceFunc) perform_seek_idle, g_object_ref (stream));
+ 		break;
+ 
+ 	case REUSING:
+@@ -1278,7 +1286,7 @@
+ 		break;
+ 
+ 	case SEEKING_PAUSED:
+-		perform_seek (stream);
++		g_idle_add ((GSourceFunc) perform_seek_idle, g_object_ref (stream));
+ 		/* fall through.  this only happens when pausing, so it's OK
+ 		 * to stop the sink here.
+ 		 */