rpms/rhythmbox/devel fix-psp-entry-types.diff, NONE, 1.1 rhythmbox.spec, 1.238, 1.239

[Bastien Nocera]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	fix-psp-entry-types.diff 
Log Message:
* Wed Mar 25 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-3
- Fix crasher in the PSP and Nokia plugins


fix-psp-entry-types.diff:

--- NEW FILE fix-psp-entry-types.diff ---
diff --git a/plugins/generic-player/rb-nokia770-source.c b/plugins/generic-player/rb-nokia770-source.c
index 8fae9ad..92a4b97 100644
--- a/plugins/generic-player/rb-nokia770-source.c
+++ b/plugins/generic-player/rb-nokia770-source.c
@@ -104,6 +104,8 @@ rb_nokia770_source_new (RBShell *shell, GMount *mount)
 
 	source = RB_NOKIA770_SOURCE (g_object_new (RB_TYPE_NOKIA770_SOURCE,
 						   "entry-type", entry_type,
+						   "ignore-entry-type", RHYTHMDB_ENTRY_TYPE_INVALID,
+						   "error-entry-type", RHYTHMDB_ENTRY_TYPE_INVALID,
 						   "mount", mount,
 						   "shell", shell,
 						   "source-group", RB_SOURCE_GROUP_DEVICES,
diff --git a/plugins/generic-player/rb-psp-source.c b/plugins/generic-player/rb-psp-source.c
index 082c3ce..0265f27 100644
--- a/plugins/generic-player/rb-psp-source.c
+++ b/plugins/generic-player/rb-psp-source.c
@@ -104,6 +104,8 @@ rb_psp_source_new (RBShell *shell, GMount *mount)
 
 	source = RB_PSP_SOURCE (g_object_new (RB_TYPE_PSP_SOURCE,
 					  "entry-type", entry_type,
+					  "ignore-entry-type", RHYTHMDB_ENTRY_TYPE_INVALID,
+					  "error-entry-type", RHYTHMDB_ENTRY_TYPE_INVALID,
 					  "mount", mount,
 					  "shell", shell,
 					  "source-group", RB_SOURCE_GROUP_DEVICES,


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- rhythmbox.spec	24 Mar 2009 14:27:11 -0000	1.238
+++ rhythmbox.spec	25 Mar 2009 13:47:33 -0000	1.239
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -54,6 +54,8 @@
 Patch0: rb-disable-power-plugin-by-default.patch
 # http://svn.gnome.org/viewvc/rhythmbox?view=revision&revision=6245
 Patch1: rb-0.12.0-use-decodebin2.patch
+#
+Patch2: fix-psp-entry-types.diff
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -89,6 +91,7 @@
 
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p0 -b .decodebin2
+%patch2 -p1 -b .psp-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,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Wed Mar 25 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-3
+- Fix crasher in the PSP and Nokia plugins
+
 * Tue Mar 24 2009 - Bastien Nocera <bnocera at redhat.com> - 0.12.0-2
 - Add patch to use decodebin2 instead of decodebin and fix
   playback problems with chained ogg streams (#446283)