rpms/rhythmbox/devel rhythmbox-0.9.3.1-playlist.patch, NONE, 1.1 rhythmbox.spec, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2654

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.3.1-playlist.patch 
Log Message:
- add patch from James "Doc" Livingston to stop a hang
  for new users (bug 183883)


rhythmbox-0.9.3.1-playlist.patch:
 shell/rb-playlist-manager.c |    4 +++-
 shell/rb-shell.c            |    4 +++-
 sources/rb-iradio-source.c  |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE rhythmbox-0.9.3.1-playlist.patch ---
diff -ur rhythmbox-0.9.3.1/shell/rb-playlist-manager.c rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c
--- rhythmbox-0.9.3.1/shell/rb-playlist-manager.c	2006-01-14 15:07:02.000000000 +1100
+++ rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c	2006-03-03 23:40:39.000000000 +1100
@@ -615,7 +615,9 @@
 					 G_CALLBACK (playlist_load_end_cb),
 					 mgr, 0);
 		
-		if (totem_pl_parser_parse (parser, uri, FALSE) != TOTEM_PL_PARSER_RESULT_SUCCESS) {
+		if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
+			g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
+		if (totem_pl_parser_parse (parser, uri, TRUE) != TOTEM_PL_PARSER_RESULT_SUCCESS) {
 			g_set_error (error,
 				     RB_PLAYLIST_MANAGER_ERROR,
 				     RB_PLAYLIST_MANAGER_ERROR_PARSE,
diff -ur rhythmbox-0.9.3.1/shell/rb-shell.c rhythmbox-0.9.3.1-fix/shell/rb-shell.c
--- rhythmbox-0.9.3.1/shell/rb-shell.c	2006-01-26 12:58:16.000000000 +1100
+++ rhythmbox-0.9.3.1-fix/shell/rb-shell.c	2006-03-03 23:40:18.000000000 +1100
@@ -2846,7 +2846,9 @@
 		
 		parser = totem_pl_parser_new ();
 		totem_pl_parser_add_ignored_mimetype (parser, "x-directory/normal");
-		result = totem_pl_parser_parse (parser, uri, FALSE);
+		if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
+			g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
+		result = totem_pl_parser_parse (parser, uri, TRUE);
 		g_object_unref (parser);
 		
 		if (result == TOTEM_PL_PARSER_RESULT_SUCCESS) {
diff -ur rhythmbox-0.9.3.1/sources/rb-iradio-source.c rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c
--- rhythmbox-0.9.3.1/sources/rb-iradio-source.c	2006-02-01 02:57:36.000000000 +1100
+++ rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c	2006-03-03 23:41:08.000000000 +1100
@@ -761,7 +761,9 @@
 	g_signal_connect_object (G_OBJECT (parser), "entry",
 				 G_CALLBACK (handle_playlist_entry_cb),
 				 source, 0);
-	switch (totem_pl_parser_parse (parser, uri, FALSE)) {
+	if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse"))
+		g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL);
+	switch (totem_pl_parser_parse (parser, uri, TRUE)) {
 	case TOTEM_PL_PARSER_RESULT_UNHANDLED:
 	case TOTEM_PL_PARSER_RESULT_IGNORED:
 		/* maybe it's the actual stream URL, then */


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- rhythmbox.spec	11 Feb 2006 05:34:26 -0000	1.51
+++ rhythmbox.spec	3 Mar 2006 23:26:44 -0000	1.52
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.3.1
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 # no nautilus-cd-burner on s390
 ExcludeArch: s390 s390x
+Patch0: rhythmbox-0.9.3.1-playlist.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -35,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .playlist
 
 %build
 
@@ -96,6 +98,10 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Fri Mar 03 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-2
+- add patch from James "Doc" Livingston to stop a hang
+  for new users (bug 183883)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.3.1-1.2
 - bump again for double-long bug on ppc(64)