From b12318154c6a42dce77a3e89d174811377c0eba7 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Mar 25 2012 16:46:34 +0000
Subject: Fix playlist_delete_selected for gtkui.


---

diff --git a/audacious-plugins-3.2.1-playlist-delete.patch b/audacious-plugins-3.2.1-playlist-delete.patch
new file mode 100644
index 0000000..54211ec
--- /dev/null
+++ b/audacious-plugins-3.2.1-playlist-delete.patch
@@ -0,0 +1,45 @@
+diff -Nur audacious-plugins-3.2.1-orig/src/gtkui/playlist_util.c audacious-plugins-3.2.1/src/gtkui/playlist_util.c
+--- audacious-plugins-3.2.1-orig/src/gtkui/playlist_util.c	2012-02-18 00:57:59.000000000 +0100
++++ audacious-plugins-3.2.1/src/gtkui/playlist_util.c	2012-03-25 18:42:32.590419418 +0200
+@@ -87,7 +87,7 @@
+         aud_playlist_queue_delete (list, at, 1);
+ }
+ 
+-void playlist_delete_selected (void)
++void playlist_util_delete_selected (void)
+ {
+     gint list = aud_playlist_get_active ();
+     gint focus = playlist_get_focus (list);
+@@ -120,7 +120,7 @@
+ void playlist_cut (void)
+ {
+     playlist_copy ();
+-    playlist_delete_selected ();
++    playlist_util_delete_selected ();
+ }
+ 
+ void playlist_paste (void)
+diff -Nur audacious-plugins-3.2.1-orig/src/gtkui/playlist_util.h audacious-plugins-3.2.1/src/gtkui/playlist_util.h
+--- audacious-plugins-3.2.1-orig/src/gtkui/playlist_util.h	2012-02-18 00:57:59.000000000 +0100
++++ audacious-plugins-3.2.1/src/gtkui/playlist_util.h	2012-03-25 18:42:32.590419418 +0200
+@@ -27,7 +27,7 @@
+ gint playlist_get_focus (gint list);
+ void playlist_song_info (void);
+ void playlist_queue_toggle (void);
+-void playlist_delete_selected (void);
++void playlist_util_delete_selected (void);
+ void playlist_copy (void);
+ void playlist_cut (void);
+ void playlist_paste (void);
+diff -Nur audacious-plugins-3.2.1-orig/src/gtkui/ui_gtk.c audacious-plugins-3.2.1/src/gtkui/ui_gtk.c
+--- audacious-plugins-3.2.1-orig/src/gtkui/ui_gtk.c	2012-02-18 00:57:59.000000000 +0100
++++ audacious-plugins-3.2.1/src/gtkui/ui_gtk.c	2012-03-25 18:42:32.590419418 +0200
+@@ -578,7 +578,7 @@
+             ui_playlist_notebook_position (GINT_TO_POINTER (aud_playlist_get_active ()), NULL);
+             return TRUE;
+         case GDK_Delete:
+-            playlist_delete_selected ();
++            playlist_util_delete_selected ();
+             return TRUE;
+         case GDK_Menu:
+             popup_menu_rclick (0, event->time);
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index e613089..7f02079 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -33,6 +33,8 @@ Patch1: audacious-plugins-3.0-alpha1-enable-gnomeshortcuts.patch
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
 # missing gmodule-2.0.pc libs
 Patch3: audacious-plugins-3.2-beta1-gmodule-pkgconfig.patch
+# Audacious #86
+Patch4: audacious-plugins-3.2.1-playlist-delete.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -135,6 +137,7 @@ providers may build it with libsidplay 2 instead.
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
 %patch3 -p1 -b .gmodule-pkgconfig
+%patch4 -p1 -b .playlist-delete
 
 for i in src/ladspa/plugin.c
 do
@@ -239,6 +242,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sun Mar 25 2012 Michael Schwendt <mschwendt@fedoraproject.org> - 3.2.1-3
+- Fix playlist_delete_selected for gtkui.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-2
 - Rebuilt for c++ ABI breakage