--- a/ChangeLog	Wed Sep 23 07:05:59 2009 +0000
+++ b/ChangeLog	Wed Sep 23 09:32:36 2009 +0000
@@ -1,3 +1,9 @@
+2009-09-23  Jerry Tan <[email protected]>
+
+        * patches/sound-juicer-03*.diff
+        * patches/sound-juicer-04*.diff
+	update patch to fix bug 11430, 11512
+
 2009-09-23  Lin Ma  <[email protected]>
 
 	* patches/brasero-01-manpages.diff: Fixed a typo.

--- a/base-specs/sound-juicer.spec	Wed Sep 23 07:05:59 2009 +0000
+++ b/base-specs/sound-juicer.spec	Wed Sep 23 09:32:36 2009 +0000
@@ -69,7 +69,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 
 %build
 %ifos linux

--- a/patches/sound-juicer-03-gconf.diff	Wed Sep 23 07:05:59 2009 +0000
+++ b/patches/sound-juicer-03-gconf.diff	Wed Sep 23 09:32:36 2009 +0000
@@ -1,26 +1,14 @@
---- /tmp/sj-main.c	2009-04-03 18:01:08.516894238 +0800
-+++ sound-juicer-2.26.0/src/sj-main.c	2009-04-03 18:02:22.047349000 +0800
-@@ -1672,17 +1672,18 @@
+--- sound-juicer-2.28.0-old/src/sj-main.c	2009-09-23 16:28:15.261130000 +0800
++++ sound-juicer-2.28.0/src/sj-main.c	2009-09-23 16:23:58.164921000 +0800
+@@ -1671,6 +1671,11 @@
      bacon_message_connection_set_callback (connection, on_message_received, NULL);
    }
  
--  brasero_media_library_start ();
--
--  metadata = sj_metadata_getter_new ();
--  g_signal_connect (metadata, "metadata", G_CALLBACK (metadata_cb), NULL);
--
-   gconf_client = gconf_client_get_default ();
-   if (gconf_client == NULL) {
-     g_warning (_("Could not create GConf client.\n"));
-     exit (1);
-   }
++  /*
++      add special setting for brasero media library init
++  */
++  g_setenv ("DBUS_SESSION_BUS_ADDRESS", "autolaunch:", TRUE);
++
+   brasero_media_library_start ();
  
-+
-+  brasero_media_library_start ();
-+
-+  metadata = sj_metadata_getter_new ();
-+  g_signal_connect (metadata, "metadata", G_CALLBACK (metadata_cb), NULL);
-+
-   upgrade_gconf ();
- 
-   gconf_client_add_dir (gconf_client, GCONF_ROOT, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+   metadata = sj_metadata_getter_new ();

--- a/patches/sound-juicer-04-gvfs.diff	Wed Sep 23 07:05:59 2009 +0000
+++ b/patches/sound-juicer-04-gvfs.diff	Wed Sep 23 09:32:36 2009 +0000
@@ -1,34 +1,18 @@
---- sound-juicer-2.26.1/libjuicer/sj-metadata-gvfs.c.old	2009-07-16 18:26:37.548393000 +0800
-+++ sound-juicer-2.26.1/libjuicer/sj-metadata-gvfs.c	2009-07-17 14:43:03.524291000 +0800
-@@ -62,19 +62,22 @@
- static char *
- device_to_cdda_uri (const char *device)
+--- sound-juicer-2.28.0-old/libjuicer/sj-metadata-gvfs.c	2009-09-23 15:35:02.342698000 +0800
++++ sound-juicer-2.28.0/libjuicer/sj-metadata-gvfs.c	2009-09-23 16:34:01.084099000 +0800
+@@ -63,7 +63,11 @@
  {
--  if (g_str_has_prefix (device, "/dev/") == FALSE)
--    return NULL;
-+#ifdef __sun
-+  return g_strdup_printf ("cdda://%s/", device + strlen ("/dev/rdsk/"));
-+#else
+   if (g_str_has_prefix (device, "/dev/") == FALSE)
+     return NULL;
++#ifdef __sun    
++  return g_strdup_printf ("cdda://%s", device + strlen ("/dev/rdsk/"));
++#else  
    return g_strdup_printf ("cdda://%s", device + strlen ("/dev/"));
-+#endif
-+
++#endif   
  }
  
  static GList *
- gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
- {
-   SjMetadataGvfsPrivate *priv;
--  AlbumDetails *album;
-+  AlbumDetails *album = NULL;
-   GError *my_error = NULL;
--  GFile *file;
--  GFileInfo *info;
-+  GFile *file = NULL;
-+  GFileInfo *info = NULL;
-   GFileEnumerator *e;
-   guint i = 0;
- 
-@@ -90,7 +93,7 @@
+@@ -89,7 +93,7 @@
  
    file = g_file_new_for_uri (priv->uri);
  
@@ -37,24 +21,17 @@
    			    G_FILE_QUERY_INFO_NONE, NULL, &my_error);
    if (info == NULL)
      goto bail;
-@@ -110,10 +113,8 @@
-     album->artist = g_strdup (_("Unknown Artist"));
-   album->genre = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.genre"));
+@@ -112,7 +116,7 @@
+   g_object_unref (info);
  
--  g_object_unref (info);
--
    /* Get tracks metadata */
 -  e = g_file_enumerate_children (file, "xattr::org.gnome.audio",
 +  e = g_file_enumerate_children (file, "*",
    				 G_FILE_QUERY_INFO_NONE, NULL, &my_error);
    if (e == NULL)
      goto bail;
-@@ -121,10 +122,10 @@
-   for (info = g_file_enumerator_next_file (e, NULL, NULL) ;
-        info != NULL ;
-        info = g_file_enumerator_next_file (e, NULL, NULL)) {
--    TrackDetails *track;
-+    TrackDetails *track = NULL;
+@@ -123,7 +127,7 @@
+     TrackDetails *track;
  
      track = g_new0 (TrackDetails, 1);
 -    track->number = i++;
@@ -62,31 +39,3 @@
      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);
-@@ -133,13 +134,13 @@
-       track->artist = g_strdup (_("Unknown Artist"));
-     track->duration = g_file_info_get_attribute_uint64 (info, "xattr::org.gnome.audio.duration");
-     album->number++;
--    g_object_unref (info);
- 
-     album->tracks = g_list_append (album->tracks, track);
-+
-   }
-   g_object_unref (e);
- 
--  priv->albums = g_list_append (NULL, album);
-+  priv->albums = g_list_append (priv->albums, album);
- 
-   return priv->albums;
- 
-@@ -212,8 +213,9 @@
-   SjMetadataGvfsPrivate *priv = SJ_METADATA_GVFS (object)->priv;
-   g_free (priv->cdrom);
-   g_free (priv->uri);
--  g_list_foreach (priv->albums, (GFunc)album_details_free, NULL);
--  g_list_free (priv->albums);
-+  // ugly hack to avoid core dump
-+  //g_list_foreach (priv->albums, (GFunc)album_details_free, NULL);
-+  //g_list_free (priv->albums);
- }
- 
- static void