rpms/audacious/devel audacious-2.2-coverart-2.patch, 1.1, 1.2 audacious.spec, 1.76, 1.77

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12242/devel

Modified Files:
	audacious-2.2-coverart-2.patch audacious.spec 
Log Message:
* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-16
- Enhance the coverart patch to not crash in URI conversion (#602113).


audacious-2.2-coverart-2.patch:
 ui_albumart.c      |    2 ++
 ui_fileinfo.c      |   17 ++++++++++-------
 ui_fileinfopopup.c |   16 ++++++++++++----
 3 files changed, 24 insertions(+), 11 deletions(-)

Index: audacious-2.2-coverart-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious-2.2-coverart-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-coverart-2.patch	6 Mar 2010 18:38:56 -0000	1.1
+++ audacious-2.2-coverart-2.patch	9 Jun 2010 09:52:41 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nur audacious-2.2-orig/src/audacious/ui_albumart.c audacious-2.2/src/audacious/ui_albumart.c
 --- audacious-2.2-orig/src/audacious/ui_albumart.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_albumart.c	2010-03-06 19:24:16.000000000 +0100
++++ audacious-2.2/src/audacious/ui_albumart.c	2010-06-09 11:35:40.000000000 +0200
 @@ -123,6 +123,8 @@
  {
  	GDir *d;
@@ -12,7 +12,7 @@ diff -Nur audacious-2.2-orig/src/audacio
  
 diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfo.c audacious-2.2/src/audacious/ui_fileinfo.c
 --- audacious-2.2-orig/src/audacious/ui_fileinfo.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_fileinfo.c	2010-03-06 19:24:16.000000000 +0100
++++ audacious-2.2/src/audacious/ui_fileinfo.c	2010-06-09 11:40:16.000000000 +0200
 @@ -790,7 +790,7 @@
  fileinfo_show_for_tuple(Tuple *tuple, gboolean updating_enabled)
  {
@@ -22,22 +22,32 @@ diff -Nur audacious-2.2-orig/src/audacio
      GtkTreeIter iter;
      GtkListStore *store;
      mowgli_dictionary_iteration_state_t state;
-@@ -849,9 +849,11 @@
+@@ -849,13 +849,16 @@
          g_object_unref(icon);
      }
  
-+    localpath = g_filename_from_uri( tuple_get_string(tuple, FIELD_FILE_PATH, NULL), NULL, NULL );
-     tmp = fileinfo_recursive_get_image(
+-    tmp = fileinfo_recursive_get_image(
 -            tuple_get_string(tuple, FIELD_FILE_PATH, NULL),
-+            localpath,
-             tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
-+    g_free(localpath);
- 
+-            tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
+-
++    tmp = tuple_get_string(tuple, FIELD_FILE_PATH, NULL);
      if (tmp) {
-         fileinfo_entry_set_image(image_artwork, tmp);
+-        fileinfo_entry_set_image(image_artwork, tmp);
+-        g_free(tmp);
++        localpath = g_filename_from_uri( tmp, NULL, NULL );
++        tmp = fileinfo_recursive_get_image(localpath,
++                                           tuple_get_string(tuple, FIELD_FILE_NAME, NULL), 0);
++        g_free(localpath);
++        if (tmp) {
++            fileinfo_entry_set_image(image_artwork, tmp);
++            g_free(tmp);
++        }
+     }
+ 
+     gtk_widget_set_sensitive(btn_apply, FALSE);
 diff -Nur audacious-2.2-orig/src/audacious/ui_fileinfopopup.c audacious-2.2/src/audacious/ui_fileinfopopup.c
 --- audacious-2.2-orig/src/audacious/ui_fileinfopopup.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/ui_fileinfopopup.c	2010-03-06 19:26:09.000000000 +0100
++++ audacious-2.2/src/audacious/ui_fileinfopopup.c	2010-06-09 11:35:40.000000000 +0200
 @@ -340,6 +340,7 @@
      gchar *last_artwork;
      const static gchar default_artwork[] = DATA_DIR "/images/audio.png";


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- audacious.spec	16 Apr 2010 10:47:01 -0000	1.76
+++ audacious.spec	9 Jun 2010 09:52:41 -0000	1.77
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -216,6 +216,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-16
+- Enhance the coverart patch to not crash in URI conversion (#602113).
+
 * Fri Apr 16 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-15
 - Fix manual and --help for options -e/-E (#581394 and AUD-174).