rpms/rhythmbox/F-9 rhythmbox-0.11.5-clean-ipod-crash.patch, NONE, 1.1 rhythmbox.spec, 1.190, 1.191

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1567

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.5-clean-ipod-crash.patch 
Log Message:
* Mon Jun 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-13
- Avoid crash on new iPods (#451547)


rhythmbox-0.11.5-clean-ipod-crash.patch:

--- NEW FILE rhythmbox-0.11.5-clean-ipod-crash.patch ---
commit bc6eac4fbae2d1a63518da8a732a404c6aca2f71
Author: Christophe Fergeau <teuf at gnome.org>
Date:   Sat May 17 17:35:06 2008 +0200

    Don't connect to notify::name before priv::ipod_db is created, fixes #524985

diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
index b7c9a31..f3488fa 100644
--- a/plugins/ipod/rb-ipod-source.c
+++ b/plugins/ipod/rb-ipod-source.c
@@ -194,8 +194,6 @@ rb_ipod_source_name_changed_cb (RBiPodSource *source, GParamSpec *spec,
 static void
 rb_ipod_source_init (RBiPodSource *source)
 {	
-	g_signal_connect (G_OBJECT (source), "notify::name",
-			  (GCallback)rb_ipod_source_name_changed_cb, NULL);
 }
 
 static GObject *
@@ -936,6 +934,9 @@ rb_ipod_load_songs (RBiPodSource *source)
 				      "name", name,
 				      NULL);
 		}
+                g_signal_connect (G_OBJECT (source), "notify::name",
+		  	          (GCallback)rb_ipod_source_name_changed_cb,
+                                  NULL);
 		priv->load_idle_id = g_idle_add ((GSourceFunc)load_ipod_db_idle_cb, source);
 	}
 	g_object_unref (volume);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-9/rhythmbox.spec,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- rhythmbox.spec	7 May 2008 12:26:19 -0000	1.190
+++ rhythmbox.spec	16 Jun 2008 10:39:29 -0000	1.191
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.5
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -73,6 +73,9 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=445160
 # http://bugzilla.gnome.org/show_bug.cgi?id=397097
 Patch9: rb-magnatune-use-ogg.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=451547
+# http://bugzilla.gnome.org/show_bug.cgi?id=524985
+Patch10: rhythmbox-0.11.5-clean-ipod-crash.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -111,6 +114,7 @@
 %patch7 -p1 -b .xfade-deadlock
 %patch8 -p1 -b .amazon-ecs
 %patch9 -p1 -b .magnatune-ogg
+%patch10 -p1 -b .clean-ipod
 
 %build
 # work around a gstreamer bug
@@ -224,6 +228,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Mon Jun 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-13
+- Avoid crash on new iPods (#451547)
+
 * Wed May 07 2008 - Bastien Nocera <bnocera at redhat.com> - 0.11.5-12
 - Prefer Ogg previews for Magnatune