rpms/sound-juicer/devel 0001-Fix-crasher-when-extracting-an-unknown-CD.patch, NONE, 1.1 sound-juicer.spec, 1.122, 1.123

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31948

Modified Files:
	sound-juicer.spec 
Added Files:
	0001-Fix-crasher-when-extracting-an-unknown-CD.patch 
Log Message:
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
- Fix crasher when extracting a CD that's not in musicbrainz (#528297)


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(-)

--- NEW FILE 0001-Fix-crasher-when-extracting-an-unknown-CD.patch ---
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
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -124,6 +124,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
 
     track = g_new0 (TrackDetails, 1);
     track->number = i;
+    track->album = album;
     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);
-- 
1.6.5.rc2



Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- sound-juicer.spec	28 Sep 2009 14:11:58 -0000	1.122
+++ sound-juicer.spec	27 Oct 2009 16:54:22 -0000	1.123
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -42,6 +42,7 @@ BuildRequires:  desktop-file-utils
 
 # already upstream, bfc60ae0bc2e8e41a234f4017600088b22af13d6
 Patch0: sound-juicer-2.28.0-use-gnome-session-inhibit.patch
+Patch1: 0001-Fix-crasher-when-extracting-an-unknown-CD.patch
 
 ExcludeArch: s390 s390x
 
@@ -51,6 +52,7 @@ GStreamer-based CD ripping tool. Saves a
 %prep
 %setup -q
 %patch0 -p1 -b .inhibit-gnome-session
+%patch1 -p1 -b .gvfs
 
 %build
 # work around a gstreamer problem where it
@@ -129,6 +131,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.0-4
+- Fix crasher when extracting a CD that's not in musicbrainz (#528297)
+
 * Mon Sep 28 2009 Richard Hughes  <rhughes at redhat.com> - 2.28.0-3
 - Apply a patch from upstream to inhibit gnome-session, rather than
   gnome-power-manager. This fixes a warning on rawhide when using sound-juicer.