[audacious-plugins/f18] In gnomeshortcuts plugin avoid asking D-BUS for g-s-d if there is

[Michael Schwendt]

commit 7798df39ec632ddb52c2594ee194e0073789022c
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Feb 22 21:33:14 2013 +0100

    In gnomeshortcuts plugin avoid asking D-BUS for g-s-d if there is
    
      no owner for it yet. That shall prevent auto-spawning g-s-d.
    - Build with -D_FILE_OFFSET_BITS=64 since the AC_SYS_LARGEFILE result
      in config.h is included too late in several files (upstream #256).

 ...-plugins-3.3-alpha1-enable-gnomeshortcuts.patch |   11 --------
 ...cious-plugins-3.3.4-enable-gnomeshortcuts.patch |   26 ++++++++++++++++++++
 audacious-plugins.spec                             |   14 +++++++++-
 3 files changed, 38 insertions(+), 13 deletions(-)
---
diff --git a/audacious-plugins-3.3.4-enable-gnomeshortcuts.patch b/audacious-plugins-3.3.4-enable-gnomeshortcuts.patch
new file mode 100644
index 0000000..0fa2fdc
--- /dev/null
+++ b/audacious-plugins-3.3.4-enable-gnomeshortcuts.patch
@@ -0,0 +1,26 @@
+diff -Nur audacious-plugins-3.3.4-orig/src/gnomeshortcuts/gnomeshortcuts.c audacious-plugins-3.3.4/src/gnomeshortcuts/gnomeshortcuts.c
+--- audacious-plugins-3.3.4-orig/src/gnomeshortcuts/gnomeshortcuts.c	2013-02-03 21:09:33.000000000 +0100
++++ audacious-plugins-3.3.4/src/gnomeshortcuts/gnomeshortcuts.c	2013-02-22 21:14:50.176950861 +0100
+@@ -48,6 +48,7 @@
+ AUD_GENERAL_PLUGIN
+ (
+ 	.name = N_("Gnome Shortcuts"),
++	.enabled_by_default = TRUE,
+ 	.domain = PACKAGE,
+ 	.about_text = about,
+ 	.init = init,
+@@ -249,6 +250,14 @@
+ 	if ((bus == NULL) || error) {
+ 		g_warning ("Error connecting to DBus: %s", error->message);
+ 	} else {
++         if ( !dbus_bus_name_has_owner(dbus_g_connection_get_connection(bus),
++                                       "org.gnome.SettingsDaemon", &error) ) {
++             if (error) {
++                 g_warning(error->message);
++                 g_error_free(error);
++             }
++             return;
++        }
+ 		media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
+ 			"org.gnome.SettingsDaemon",
+ 			"/org/gnome/SettingsDaemon/MediaKeys",
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 0a7bf53..06ba1eb 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -25,7 +25,7 @@ Source3: README.licenses
 # Fedora customization
 Patch0: audacious-plugins-3.0-alpha1-xmms-skindir.patch
 # Fedora customization (RFE bz #632388)
-Patch1: audacious-plugins-3.3-alpha1-enable-gnomeshortcuts.patch
+Patch1: audacious-plugins-3.3.4-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.1-beta1-ladspa.patch
 
@@ -146,6 +146,10 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
 # Enforce availability of the audacious(plugin-api) dependency.
 %{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
 
+# fixed after 3.4-alpha1 via early inclusion of config.h / #256
+CFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64"
+CXXFLAGS="${RPM_OPT_FLAGS} -D_FILE_OFFSET_BITS=64"
+
 %configure  --enable-gio  \
     --disable-aac  \
     --disable-ffaudio  \
@@ -215,6 +219,12 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 
 
 %changelog
+* Fri Feb 22 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.4-2
+- In gnomeshortcuts plugin avoid asking D-BUS for g-s-d if there is
+  no owner for it yet. That shall prevent auto-spawning g-s-d.
+- Build with -D_FILE_OFFSET_BITS=64 since the AC_SYS_LARGEFILE result
+  in config.h is included too late in several files (upstream #256).
+
 * Sun Feb  3 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.3.4-1
 - Update to 3.3.4 (last upstream maintenance release for 3.3.x).