From de418f1634b8b93c7a68ade4ae815fc53738e961 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Apr 10 2010 09:14:43 +0000
Subject: - Fix the gtk_message_dialog_new_with_markup() call as in 2.3.


---

diff --git a/audacious-plugins-2.2-g_markup.patch b/audacious-plugins-2.2-g_markup.patch
new file mode 100644
index 0000000..738b760
--- /dev/null
+++ b/audacious-plugins-2.2-g_markup.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-2.2-orig/src/skins/plugin.c audacious-plugins-2.2/src/skins/plugin.c
+--- audacious-plugins-2.2-orig/src/skins/plugin.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2/src/skins/plugin.c	2010-04-10 11:08:35.000000000 +0200
+@@ -255,7 +255,7 @@
+                                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            GTK_MESSAGE_ERROR,
+                                            GTK_BUTTONS_OK,
+-                                           _(markup));
++                                           "%s",_(markup));
+ 
+     gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+     gtk_widget_show(GTK_WIDGET(dialog));
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 723d6f7..a445c2b 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 31%{?dist}
+Release: 32%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -69,6 +69,8 @@ Patch19: audacious-plugins-2.2-playlist-font-safety.patch
 Patch20: audacious-plugins-2.2-amidi.patch
 # merged upstream - Visualization Mode issues, fixed while looking at bz 575093
 Patch21: audacious-plugins-2.2-ui_vis.patch
+# obsolete with version upgrade
+Patch22: audacious-plugins-2.2-g_markup.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -220,6 +222,7 @@ in Vortex (.vtx) format.
 %patch19 -p1 -b .playlist-font-safety
 %patch20 -p1 -b .amidi
 %patch21 -p1 -b .ui_vis
+%patch22 -p1 -b .g_markup
 
 for i in src/ladspa/ladspa.c
 do
@@ -320,6 +323,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Apr 10 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-32
+- Fix the gtk_message_dialog_new_with_markup() call as in 2.3.
+
 * Thu Apr  8 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-31
 - Merge minor enhancements to the Status Icon patch to improve
   where it pops up with fast mouse movement.