rpms/audacious/devel audacious-2.2-disabled-iplugins.patch, 1.1, 1.2 audacious.spec, 1.59, 1.60

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28813

Modified Files:
	audacious-2.2-disabled-iplugins.patch audacious.spec 
Log Message:
* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
- Added another fix to the disabled-iplugins patch.


audacious-2.2-disabled-iplugins.patch:
 playback.c       |    2 +-
 playlist-utils.c |   16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

Index: audacious-2.2-disabled-iplugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious-2.2-disabled-iplugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacious-2.2-disabled-iplugins.patch	30 Dec 2009 19:35:08 -0000	1.1
+++ audacious-2.2-disabled-iplugins.patch	31 Dec 2009 13:41:19 -0000	1.2
@@ -1,6 +1,18 @@
-diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2/src/audacious/playlist-utils.c
+diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2-fedora/src/audacious/playback.c
+--- audacious-2.2-orig/src/audacious/playback.c	2009-11-22 23:43:47.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playback.c	2009-12-31 14:36:28.000000000 +0100
+@@ -448,7 +448,7 @@
+         return FALSE;
+     }
+ 
+-    if (decoder == NULL)
++    if (decoder == NULL || (decoder && !decoder->enabled))
+     {
+         ProbeResult * pr = input_check_file (filename);
+ 
+diff -Nur audacious-2.2-orig/src/audacious/playlist-utils.c audacious-2.2-fedora/src/audacious/playlist-utils.c
 --- audacious-2.2-orig/src/audacious/playlist-utils.c	2009-11-22 23:43:47.000000000 +0100
-+++ audacious-2.2/src/audacious/playlist-utils.c	2009-12-30 20:28:30.000000000 +0100
++++ audacious-2.2-fedora/src/audacious/playlist-utils.c	2009-12-31 14:35:14.000000000 +0100
 @@ -288,7 +288,7 @@
      InputPlugin * decoder = NULL;
      gchar * temp = g_strdup (filename);


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- audacious.spec	30 Dec 2009 19:35:08 -0000	1.59
+++ audacious.spec	31 Dec 2009 13:41:19 -0000	1.60
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Summary: GTK2 based media player similar to XMMS
@@ -187,6 +187,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Added another fix to the disabled-iplugins patch.
+
 * Wed Dec 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Patch Audacious so that filename_find_decoder only considers
   enabled input plugins (disabled modplug plugin effectively disabled