rpms/sound-juicer/F-11 sj-gvfs-crash-fix.patch, 1.1, 1.2 sound-juicer.spec, 1.114, 1.115

[Bastien Nocera]

Author: hadess

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

Modified Files:
	sj-gvfs-crash-fix.patch sound-juicer.spec 
Log Message:
* Thu May 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
- Update patch for #498764

sj-gvfs-crash-fix.patch:

Index: sj-gvfs-crash-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/F-11/sj-gvfs-crash-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sj-gvfs-crash-fix.patch	7 May 2009 17:53:55 -0000	1.1
+++ sj-gvfs-crash-fix.patch	7 May 2009 21:47:20 -0000	1.2
@@ -1,5 +1,5 @@
 diff --git a/libjuicer/sj-metadata-getter.c b/libjuicer/sj-metadata-getter.c
-index 4a55ecd..5e83b9f 100644
+index 4a55ecd..9e5e6c9 100644
 --- a/libjuicer/sj-metadata-getter.c
 +++ b/libjuicer/sj-metadata-getter.c
 @@ -22,6 +22,7 @@
@@ -10,21 +10,21 @@ index 4a55ecd..5e83b9f 100644
  #include "sj-metadata-getter.h"
  #include "sj-metadata-marshal.h"
  #include "sj-metadata.h"
-@@ -158,8 +159,10 @@ fire_signal_idle (SjMetadataGetterSignal *signal)
+@@ -155,11 +156,10 @@ sj_metadata_getter_set_proxy_port (SjMetadataGetter *mdg, const int proxy_port)
+ static gboolean
+ fire_signal_idle (SjMetadataGetterSignal *signal)
+ {
++  /* The callback is the sucker, and now owns the albums list */
    g_signal_emit_by_name (G_OBJECT (signal->mdg), "metadata",
    			 signal->albums, signal->error);
  
 -  /* This will kill the albums, as
 -   * those belong to the metadata backend */
-+  /* Kill the albums */
-+  g_list_foreach (signal->albums, (GFunc)album_details_free, NULL);
-+  g_list_free (signal->albums);
-+
    if (signal->metadata)
      g_object_unref (signal->metadata);
    if (signal->error != NULL)
 diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
-index 4e34470..27382d0 100644
+index 4e34470..fc41d51 100644
 --- a/libjuicer/sj-metadata-gvfs.c
 +++ b/libjuicer/sj-metadata-gvfs.c
 @@ -35,7 +35,6 @@
@@ -57,7 +57,7 @@ index 4e34470..27382d0 100644
    }
  
    file = g_file_new_for_uri (priv->uri);
-@@ -139,18 +138,18 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
+@@ -139,22 +138,21 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
    }
    g_object_unref (e);
  
@@ -84,7 +84,11 @@ index 4e34470..27382d0 100644
    return NULL;
  }
  
-@@ -192,8 +191,7 @@ sj_metadata_gvfs_set_property (GObject *object, guint property_id,
+-
+ /**
+  * GObject methods
+  */
+@@ -192,8 +190,7 @@ sj_metadata_gvfs_set_property (GObject *object, guint property_id,
  
    switch (property_id) {
    case PROP_DEVICE:
@@ -94,7 +98,7 @@ index 4e34470..27382d0 100644
      priv->cdrom = g_value_dup_string (value);
      priv->uri = device_to_cdda_uri (priv->cdrom);
      break;
-@@ -212,8 +210,6 @@ sj_metadata_gvfs_finalize (GObject *object)
+@@ -212,8 +209,6 @@ sj_metadata_gvfs_finalize (GObject *object)
    SjMetadataGvfsPrivate *priv = SJ_METADATA_GVFS (object)->priv;
    g_free (priv->cdrom);
    g_free (priv->uri);


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/F-11/sound-juicer.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- sound-juicer.spec	7 May 2009 17:53:55 -0000	1.114
+++ sound-juicer.spec	7 May 2009 21:47:20 -0000	1.115
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.26.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.26/%{name}-%{version}.tar.bz2
@@ -115,6 +115,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu May 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
+- Update patch for #498764
+
 * Thu May 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-2
 - Fix gvfs metadata getter crasher (#498764)