rhythmbox r6106 - in trunk: . plugins/audiocd

[hadess svn gnome org]

Author: hadess
Date: Thu Dec 18 10:07:20 2008
New Revision: 6106
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6106&view=rev

Log:
2008-12-18  Bastien Nocera  <hadess hadess net>

	* plugins/audiocd/sj-metadata-musicbrainz3.c (mb_list_albums):
	Add fix from sound-juicer



Modified:
   trunk/ChangeLog
   trunk/plugins/audiocd/sj-metadata-musicbrainz3.c

Modified: trunk/plugins/audiocd/sj-metadata-musicbrainz3.c
==============================================================================
--- trunk/plugins/audiocd/sj-metadata-musicbrainz3.c	(original)
+++ trunk/plugins/audiocd/sj-metadata-musicbrainz3.c	Thu Dec 18 10:07:20 2008
@@ -55,7 +55,6 @@
   MbWebService mb;
   MbDisc disc;
   char *cdrom;
-  GList *albums;
   /* Proxy */
   char *http_proxy;
   int http_proxy_port;
@@ -213,6 +212,7 @@
 mb_list_albums (SjMetadata *metadata, char **url, GError **error)
 {
   SjMetadataMusicbrainz3Private *priv;
+  GList *albums = NULL;
   MbQuery query;
   MbReleaseFilter filter;
   MbResultList results;
@@ -225,7 +225,6 @@
   priv = GET_PRIVATE (metadata);
 
   if (sj_metadata_helper_check_media (priv->cdrom, error) == FALSE) {
-    priv->albums = NULL;
     return NULL;
   }
 
@@ -268,13 +267,13 @@
     album = make_album_from_release (release);
     album->metadata_source = SOURCE_MUSICBRAINZ;
     fill_empty_durations (priv->disc, album);
-    priv->albums = g_list_append (priv->albums, album);
+    albums = g_list_append (albums, album);
     mb_release_free (release);
   }
   mb_result_list_free (results);
   mb_query_free (query);
 
-  return priv->albums;
+  return albums;
 }
 
 /*