rpms/rhythmbox/F-7 rhythmbox-disable-local-uri-escaping.patch, NONE, 1.1 rhythmbox.spec, 1.115, 1.116

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-disable-local-uri-escaping.patch 
Log Message:
* Thu Oct 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-3.fc7
- Hopefully fix indexing files with spaces in the name (#291571)


rhythmbox-disable-local-uri-escaping.patch:

--- NEW FILE rhythmbox-disable-local-uri-escaping.patch ---
Index: lib/rb-file-helpers.c
===================================================================
--- lib/rb-file-helpers.c	(revision 5381)
+++ lib/rb-file-helpers.c	(working copy)
@@ -1070,6 +1070,8 @@
 {
 	char *result = NULL;
 
+	g_return_val_if_fail (uri != NULL, NULL);
+
 	if (uri[0] == '/') {
 		/* local path */
 		char *tmp;
@@ -1081,17 +1083,6 @@
 		tmp = escape_extra_gnome_vfs_chars (tmp);
 		result = g_strconcat ("file://", tmp, NULL);
 		g_free (tmp);
-	} else  if (g_str_has_prefix (uri, "file://")) {
-	    	/* local file, rhythmdb wants this path escaped */
-		char *tmp1, *tmp2;
-		tmp1  = gnome_vfs_unescape_string (uri + 7, NULL);  /* ignore "file://" */
-		tmp2 = gnome_vfs_escape_path_string (tmp1);
-		g_free (tmp1);
-		if (tmp2 == NULL)
-			return NULL;
-		tmp2 = escape_extra_gnome_vfs_chars (tmp2);
-		result = g_strconcat ("file://", tmp2, NULL); /* re-add scheme */
-		g_free (tmp2);
 	} else {
 		GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-7/rhythmbox.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- rhythmbox.spec	24 Sep 2007 13:45:48 -0000	1.115
+++ rhythmbox.spec	18 Oct 2007 09:15:03 -0000	1.116
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -49,6 +49,8 @@
 Patch2: rhythmbox-enable-stores.patch
 Patch3: rhythmbox-0.10-shops-resizing.patch
 Patch4: rhythmbox-0.10.1-podcasts.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=291571
+Patch5: rhythmbox-disable-local-uri-escaping.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -67,6 +69,7 @@
 cd ../
 %patch3 -p0 -b .dont-resize-stores
 %patch4 -p1 -b .ipod-podcasts
+%patch5 -p0 -b .uri-escaping
 
 %build
 
@@ -155,6 +158,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Thu Oct 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-3.fc7
+- Hopefully fix indexing files with spaces in the name (#291571)
+
 * Mon Sep 24 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-2.fc7
 - Add patch from upstream to mark Podcasts as such when uploading them to
   an iPod (#302691)