rpms/rhythmbox/F-12 rb-mtp-crasher-on-start.patch, NONE, 1.1 rhythmbox.spec, 1.277, 1.278

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30365

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-mtp-crasher-on-start.patch 
Log Message:
* Tue Feb 09 2010 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
- Fix crasher on startup when the MTP device could not be
  opened (#563195)


rb-mtp-crasher-on-start.patch:
 rb-mtp-thread.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE rb-mtp-crasher-on-start.patch ---
commit 627e6a50402ee8b047a65935a10e7e1ffdd870ec
Author: Jonathan Matthew <jonathan at d14n.org>
Date:   Tue Dec 29 18:48:15 2009 +1000

    mtp: only release the device if we managed to open it

diff --git a/plugins/mtpdevice/rb-mtp-thread.c b/plugins/mtpdevice/rb-mtp-thread.c
index 95af372..76bb07e 100644
--- a/plugins/mtpdevice/rb-mtp-thread.c
+++ b/plugins/mtpdevice/rb-mtp-thread.c
@@ -769,7 +769,9 @@ impl_finalize (GObject *object)
 
 	g_hash_table_destroy (thread->albums);
 
-	LIBMTP_Release_Device (thread->device);
+	if (thread->device != NULL) {
+		LIBMTP_Release_Device (thread->device);
+	}
 
 	G_OBJECT_CLASS (rb_mtp_thread_parent_class)->finalize (object);
 }


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-12/rhythmbox.spec,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -p -r1.277 -r1.278
--- rhythmbox.spec	6 Jan 2010 13:43:12 -0000	1.277
+++ rhythmbox.spec	9 Feb 2010 14:38:27 -0000	1.278
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -58,6 +58,8 @@ Patch1: rb-webkit-crasher.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601524
 # https://bugzilla.gnome.org/show_bug.cgi?id=602957
 Patch2: rb-playbin2-track-changes.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=563195
+Patch3: rb-mtp-crasher-on-start.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -94,6 +96,7 @@ from, and sending media to UPnP/DLNA net
 %patch0 -p1 -b .http-head
 %patch1 -p1 -b .webkit
 %patch2 -p1 -b .track-change-hang
+%patch3 -p1 -b .mtp-crasher
 
 # 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/' '{}' ';'
@@ -225,6 +228,10 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Tue Feb 09 2010 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
+- Fix crasher on startup when the MTP device could not be
+  opened (#563195)
+
 * Wed Jan 06 2010 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
 - Fix potential hangs on track changes