[audacious] - Replace file-ext-in-url patch with upstream's probe.c commit. - Enable gnomeshortcuts plugin by de

[Michael Schwendt]

commit 8128dd1cef70886937d64677b2f439263ce4bd35
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Sep 14 22:19:20 2010 +0200

    - Replace file-ext-in-url patch with upstream's probe.c commit.
    - Enable gnomeshortcuts plugin by default, if not disabled in
      user's preferences (#632388).

 audacious-2.4.0-file-ext-in-url.patch       |   20 --------------------
 audacious-2.4.0-probe-file-ext-in-url.patch |   15 +++++++++++++++
 audacious.spec                              |    5 +++--
 3 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/audacious-2.4.0-probe-file-ext-in-url.patch b/audacious-2.4.0-probe-file-ext-in-url.patch
new file mode 100644
index 0000000..d3c9c2a
--- /dev/null
+++ b/audacious-2.4.0-probe-file-ext-in-url.patch
@@ -0,0 +1,15 @@
+diff -Nur audacious-2.4.0-orig/src/audacious/probe.c audacious-2.4.0/src/audacious/probe.c
+--- audacious-2.4.0-orig/src/audacious/probe.c	2010-08-26 01:04:25.000000000 +0200
++++ audacious-2.4.0/src/audacious/probe.c	2010-09-14 22:08:20.000000000 +0200
+@@ -147,6 +147,11 @@
+ 
+     AUDDBG ("Probing by extension.\n");
+     s = g_ascii_strdown (s + 1, -1);
++
++    gchar * q = strrchr (s, '?');
++    if (q != NULL)
++        * q = 0;
++
+     input_plugin_for_key (INPUT_KEY_EXTENSION, s, (PluginForEachFunc)
+      probe_func_fast, state);
+     g_free (s);
diff --git a/audacious.spec b/audacious.spec
index a11676b..69dd571 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -14,8 +14,8 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
-# submitted upstream by email
-Patch0: audacious-2.4.0-file-ext-in-url.patch
+# from upstream
+Patch0: audacious-2.4.0-probe-file-ext-in-url.patch
 # Fedora customization (RFE bz #632388)
 Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
 
@@ -191,6 +191,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
 * Tue Sep 14 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.0-3
+- Replace file-ext-in-url patch with upstream's probe.c commit.
 - Enable gnomeshortcuts plugin by default, if not disabled in
   user's preferences (#632388).