[audacious-plugins] Patch gnomeshortcuts plug-in to avoid auto-activating gnome-settings-daemon.

Michael Schwendt mschwendt at fedoraproject.org
Thu Feb 14 20:29:42 UTC 2013


commit 55972c07f34e43db3b9e24ca4918ac5bd8a39a46
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Feb 14 21:29:34 2013 +0100

    Patch gnomeshortcuts plug-in to avoid auto-activating gnome-settings-daemon.

 ...-plugins-3.4-alpha1-enable-gnomeshortcuts.patch |   17 ++++++++++++++++-
 audacious-plugins.spec                             |    5 ++++-
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/audacious-plugins-3.4-alpha1-enable-gnomeshortcuts.patch b/audacious-plugins-3.4-alpha1-enable-gnomeshortcuts.patch
index 5d46682..b4a11f2 100644
--- a/audacious-plugins-3.4-alpha1-enable-gnomeshortcuts.patch
+++ b/audacious-plugins-3.4-alpha1-enable-gnomeshortcuts.patch
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-3.4-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c audacious-plugins-3.4-alpha1/src/gnomeshortcuts/gnomeshortcuts.c
 --- audacious-plugins-3.4-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c	2013-02-04 01:16:51.000000000 +0100
-+++ audacious-plugins-3.4-alpha1/src/gnomeshortcuts/gnomeshortcuts.c	2013-02-07 20:12:44.550248556 +0100
++++ audacious-plugins-3.4-alpha1/src/gnomeshortcuts/gnomeshortcuts.c	2013-02-14 21:26:25.000000000 +0100
 @@ -47,6 +47,7 @@
  AUD_GENERAL_PLUGIN
  (
@@ -9,3 +9,18 @@ diff -Nur audacious-plugins-3.4-alpha1-orig/src/gnomeshortcuts/gnomeshortcuts.c
      .domain = PACKAGE,
      .about_text = about,
      .init = init,
+@@ -248,6 +249,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 ffead5f..6737bd2 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -11,7 +11,7 @@
 
 Name: audacious-plugins
 Version: 3.4
-Release: 0.1.alpha1%{?dist}
+Release: 0.2.alpha1%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -216,6 +216,9 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 
 
 %changelog
+* Thu Feb 14 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4-0.2.alpha1
+- Patch gnomeshortcuts plug-in to avoid auto-activating gnome-settings-daemon.
+
 * Thu Feb  7 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 3.4-0.1.alpha1
 - Playlist column resize feature requires GTK+ 3.8 to work correctly.
 - Add scrobbler2 to %%check.


More information about the scm-commits mailing list