rpms/rhythmbox/devel rb-webkit-crasher.patch, NONE, 1.1 rhythmbox.spec, 1.278, 1.279 0001-Fix-audio-tags-in-Brasero-project-files.patch, 1.1, NONE 0001-Use-C-only-for-the-browser-plugin.patch, 1.1, NONE 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch, 1.1, NONE rb-fix-daap-plugin.patch, 1.1, NONE rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9026

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-webkit-crasher.patch 
Removed Files:
	0001-Fix-audio-tags-in-Brasero-project-files.patch 
	0001-Use-C-only-for-the-browser-plugin.patch 
	0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch 
	rb-fix-daap-plugin.patch 
	rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
- Fix crasher in WebKit when using the context pane (#540672)


rb-webkit-crasher.patch:
 ContextView.py |    8 ++++++++
 1 file changed, 8 insertions(+)

--- NEW FILE rb-webkit-crasher.patch ---
commit e93fd2d7afe1411a5a60052a4adecd6a56db5b7b
Author: Jonathan Matthew <jonathan at d14n.org>
Date:   Fri Nov 27 07:14:51 2009 +1000

    context: use an idle handler for track changes (bug #602140)
    
    The playing-song-changed signal is sometimes emitted on a streaming
    thread.  Calling into webkit on non-main threads causes it to crash
    pretty reliably, so we need to use an idle handler to process it on the
    main thread.

diff --git a/plugins/context/context/ContextView.py b/plugins/context/context/ContextView.py
index 7e2c0d6..e204fc4 100644
--- a/plugins/context/context/ContextView.py
+++ b/plugins/context/context/ContextView.py
@@ -174,6 +174,14 @@ class ContextView (gobject.GObject):
                 self.top_five_list[(i,)] = ("%d. " % (i+1), track)
 
     def playing_changed_cb (self, playing, user_data):
+        # this sometimes happens on a streaming thread, so we need to
+        # move it to the main thread
+        gobject.idle_add (self.playing_changed_idle_cb)
+
+    def playing_changed_idle_cb (self):
+        if self.sp is None:
+            return
+
         playing_entry = self.sp.get_playing_entry ()
         if playing_entry is None:
             return


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -p -r1.278 -r1.279
--- rhythmbox.spec	7 Dec 2009 14:05:39 -0000	1.278
+++ rhythmbox.spec	10 Dec 2009 15:47:12 -0000	1.279
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -39,6 +39,7 @@ BuildRequires: gnome-doc-utils
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: libsoup-devel >= 2.3.0
+BuildRequires: hal-devel
 BuildRequires: lirc-devel
 BuildRequires: libmtp-devel
 BuildRequires: gstreamer-python-devel
@@ -51,6 +52,9 @@ ExcludeArch:    s390 s390x
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=596615
 Patch0: rb-no-HEAD-for-podcasts.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=540672
+# https://bugzilla.gnome.org/show_bug.cgi?id=602140
+Patch1: rb-webkit-crasher.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -85,6 +89,7 @@ from, and sending media to UPnP/DLNA net
 %setup -q
 
 %patch0 -p1 -b .http-head
+%patch1 -p1 -b .webkit
 
 # Use the installed louie, not the one in Coherence
 find plugins/coherence/upnp_coherence/ -type f -exec sed -i 's/coherence.extern.louie as louie/louie/' '{}' ';'
@@ -216,6 +221,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
+- Fix crasher in WebKit when using the context pane (#540672)
+
 * Mon Dec 07 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-2
 - Remove libhal requirement
 


--- 0001-Fix-audio-tags-in-Brasero-project-files.patch DELETED ---


--- 0001-Use-C-only-for-the-browser-plugin.patch DELETED ---


--- 0001-Use-Cubic-volume-when-StreaVolume-interface-is-avail.patch DELETED ---


--- rb-fix-daap-plugin.patch DELETED ---


--- rhythmbox-0.12.5-use-gnome-session-to-inhibit.patch DELETED ---