[audacious] - Enable gnomeshortcuts plugin by default, if not disabled in user's preferences (#632388).

[Michael Schwendt]

commit 768448cc949f648626007793c36313713ddb56a8
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Sep 14 22:05:53 2010 +0200

    - Enable gnomeshortcuts plugin by default, if not disabled in
      user's preferences (#632388).

 audacious-2.4.0-enable-gnomeshortcuts.patch |   15 +++++++++++++++
 audacious.spec                              |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/audacious-2.4.0-enable-gnomeshortcuts.patch b/audacious-2.4.0-enable-gnomeshortcuts.patch
new file mode 100644
index 0000000..2d3272c
--- /dev/null
+++ b/audacious-2.4.0-enable-gnomeshortcuts.patch
@@ -0,0 +1,15 @@
+diff -Nur audacious-2.4.0-orig/src/audacious/plugin-registry.c audacious-2.4.0/src/audacious/plugin-registry.c
+--- audacious-2.4.0-orig/src/audacious/plugin-registry.c	2010-08-26 01:04:25.000000000 +0200
++++ audacious-2.4.0/src/audacious/plugin-registry.c	2010-09-14 22:00:45.000000000 +0200
+@@ -469,6 +469,11 @@
+         AUDDBG ("New plugin: %s %d:%d\n", path, type, number);
+         g_return_if_fail (! registry_locked);
+         plugin = plugin_new (module, type, number, TRUE, header);
++        if (type == PLUGIN_TYPE_GENERAL) {
++            if (path && g_strrstr(path,"gnomeshortcuts.so")!=NULL) {
++                plugin->enabled = TRUE;
++            }
++        }
+     }
+ 
+     AUDDBG ("Register plugin: %s %d:%d\n", path, type, number);
diff --git a/audacious.spec b/audacious.spec
index 8d83b2c..a11676b 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -5,7 +5,7 @@
 
 Name: audacious
 Version: 2.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -16,6 +16,8 @@ Source0: http://distfiles.atheme.org/audacious-%{version}.tgz
 
 # submitted upstream by email
 Patch0: audacious-2.4.0-file-ext-in-url.patch
+# Fedora customization (RFE bz #632388)
+Patch1: audacious-2.4.0-enable-gnomeshortcuts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,6 +81,7 @@ Files needed when building software for the Audacious audio player.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .filext-in-url
+%patch1 -p1 -b .enable-gnomeshortcuts
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 # From .desktop files remove MIME types the base build of the
@@ -187,6 +190,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Sep 14 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.0-3
+- Enable gnomeshortcuts plugin by default, if not disabled in
+  user's preferences (#632388).
+
 * Mon Sep 13 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4.0-2
 - Strip off parameters of HTTP/HTTPS URLs to fix file name extension
   detection (#632367, Hans de Goede).