rpms/sound-juicer/F-12 0001-Fix-crasher-when-extracting-an-unknown-CD.patch, 1.1, 1.2

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27822

Modified Files:
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch 
Log Message:
Fix patch application

0001-Fix-crasher-when-extracting-an-unknown-CD.patch:
 b/libjuicer/sj-metadata-gvfs.c |    6 +++---
 libjuicer/sj-metadata-gvfs.c   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: 0001-Fix-crasher-when-extracting-an-unknown-CD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/F-12/0001-Fix-crasher-when-extracting-an-unknown-CD.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Fix-crasher-when-extracting-an-unknown-CD.patch	27 Oct 2009 16:32:26 -0000	1.1
+++ 0001-Fix-crasher-when-extracting-an-unknown-CD.patch	27 Oct 2009 16:44:39 -0000	1.2
@@ -1,14 +1,30 @@
-From 032ba8456631f6bfb361cbc75bdb8b29ceff5672 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess at hadess.net>
-Date: Tue, 27 Oct 2009 16:01:37 +0000
-Subject: [PATCH] Fix crasher when extracting an unknown CD
-
-If the album data isn't set in the track, then we can't
-get to the album title, and kaboom!
----
- libjuicer/sj-metadata-gvfs.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
+diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
+index fc41d51..8ccdd4c 100644
+--- a/libjuicer/sj-metadata-gvfs.c
++++ b/libjuicer/sj-metadata-gvfs.c
+@@ -76,7 +76,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
+   GFile *file = NULL;
+   GFileInfo *info;
+   GFileEnumerator *e;
+-  guint i = 0;
++  guint i = 1;
+ 
+   g_return_val_if_fail (SJ_IS_METADATA_GVFS (metadata), NULL);
+ 
+@@ -119,11 +119,11 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
+ 
+   for (info = g_file_enumerator_next_file (e, NULL, NULL) ;
+        info != NULL ;
+-       info = g_file_enumerator_next_file (e, NULL, NULL)) {
++       info = g_file_enumerator_next_file (e, NULL, NULL), i++) {
+     TrackDetails *track;
+ 
+     track = g_new0 (TrackDetails, 1);
+-    track->number = i++;
++    track->number = i;
+     track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
+     if (track->title == NULL)
+       track->title = g_strdup_printf (_("Track %d"), i);
 diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
 index 8ccdd4c..7389d7f 100644
 --- a/libjuicer/sj-metadata-gvfs.c