rpms/audacious/F-13 audacious-2.2-unescape-fileinfo.patch, NONE, 1.1 audacious.spec, 1.72, 1.73 audacious-2.2-coverart.patch, 1.1, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10740/F-13

Modified Files:
	audacious.spec 
Added Files:
	audacious-2.2-unescape-fileinfo.patch 
Removed Files:
	audacious-2.2-coverart.patch 
Log Message:
sync with Rawhide

audacious-2.2-unescape-fileinfo.patch:
 ui_fileinfo.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE audacious-2.2-unescape-fileinfo.patch ---
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-20 18:57:36.000000000 +0100
@@ -941,6 +941,7 @@
 void ui_fileinfo_show (gint playlist, gint entry)
 {
     const gchar * filename = playlist_entry_get_filename (playlist, entry);
+    char *unescaped = NULL;
     InputPlugin * decoder = playlist_entry_get_decoder (playlist, entry);
     Tuple * tuple;
 
@@ -959,13 +960,15 @@
         g_free (probe);
     }
 
+    unescaped = g_uri_unescape_string(filename,NULL);
     if (decoder == NULL)
     {
         gchar * message = g_strdup_printf ("No decoder found for %s.\n",
-         filename);
+                                           unescaped);
 
         hook_call ("interface show error", message);
         g_free (message);
+        g_free(unescaped);
         return;
     }
 
@@ -985,10 +988,11 @@
     else
     {
         gchar * message = g_strdup_printf ("No info available for "
-         "%s.\n", filename);
+         "%s.\n", unescaped);
 
         hook_call ("interface show error", message);
         g_free (message);
+        g_free(unescaped);
     }
 }
 


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-13/audacious.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- audacious.spec	15 Feb 2010 19:26:14 -0000	1.72
+++ audacious.spec	20 Mar 2010 18:10:22 -0000	1.73
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -28,7 +28,9 @@ Patch4: audacious-2.2-set_tuple_cb.patch
 #
 Patch5: audacious-2.2-libm.patch
 # obsolete with version upgrade
-Patch6: audacious-2.2-coverart.patch
+Patch6: audacious-2.2-coverart-2.patch
+#
+Patch7: audacious-2.2-unescape-fileinfo.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -94,6 +96,7 @@ sed -i -e 's!\(build_stamp.*\)UNSUPPORTE
 %patch4 -p1 -b .set_tuple_cb
 %patch5 -p1 -b .libm
 %patch6 -p1 -b .coverart
+%patch7 -p1 -b .unescape-fileinfo
 
 # From .desktop files remove MIME types the base build of the
 # Fedora audacious-plugins package does not understand.
@@ -209,6 +212,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sat Mar 20 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-14
+- Unescape filename uri in fileinfo dialog to avoid g_markup crash (#575387).
+
+* Sat Mar  6 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-13
+- Enhance the coverart patch to not display an empty filename for
+  streams when title isn't known yet and filename isn't either.
+
 * Mon Feb 15 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-12
 - Fix album cover art image loader (which cannot handle vfs URIs).
 


--- audacious-2.2-coverart.patch DELETED ---