[cinnamon-settings-daemon/f20] add mpris pause fix

leigh123linux leigh123linux at fedoraproject.org
Fri Apr 18 11:12:28 UTC 2014


commit a50d43aa827fca17c2b53c73addd9d6e09b9d422
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Apr 18 12:12:07 2014 +0100

    add mpris pause fix

 add_mpris_support.patch       |   10 ++++++++--
 cinnamon-settings-daemon.spec |    5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/add_mpris_support.patch b/add_mpris_support.patch
index 0210451..1fbf209 100644
--- a/add_mpris_support.patch
+++ b/add_mpris_support.patch
@@ -1,7 +1,7 @@
 diff -uNrp a/plugins/media-keys/bus-watch-namespace.c b/plugins/media-keys/bus-watch-namespace.c
 --- a/plugins/media-keys/bus-watch-namespace.c	1970-01-01 01:00:00.000000000 +0100
 +++ b/plugins/media-keys/bus-watch-namespace.c	2013-11-04 10:41:10.925022405 +0000
-@@ -0,0 +1,347 @@
+@@ -0,0 +1,348 @@
 +/*
 + * Copyright 2013 Canonical Ltd.
 + *
@@ -21,6 +21,7 @@ diff -uNrp a/plugins/media-keys/bus-watch-namespace.c b/plugins/media-keys/bus-w
 + * Author: Lars Uebernickel <lars.uebernickel at canonical.com>
 + */
 +
++#include "config.h"
 +#include <gio/gio.h>
 +#include <string.h>
 +#include "bus-watch-namespace.h"
@@ -472,7 +473,7 @@ diff -uNrp a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
 diff -uNrp a/plugins/media-keys/mpris-controller.c b/plugins/media-keys/mpris-controller.c
 --- a/plugins/media-keys/mpris-controller.c	1970-01-01 01:00:00.000000000 +0100
 +++ b/plugins/media-keys/mpris-controller.c	2013-11-04 10:58:55.607910850 +0000
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,214 @@
 +/*
 + * Copyright © 2013 Intel Corporation.
 + *
@@ -558,6 +559,9 @@ diff -uNrp a/plugins/media-keys/mpris-controller.c b/plugins/media-keys/mpris-co
 +  if (!priv->mpris_client_proxy)
 +    return FALSE;
 +
++  if (g_strcmp0 (key, "Play") == 0)
++    key = "PlayPause";
++
 +  g_debug ("calling %s over dbus to mpris client %s",
 +           key, g_dbus_proxy_get_name (priv->mpris_client_proxy));
 +  g_dbus_proxy_call (priv->mpris_client_proxy,
@@ -580,6 +584,8 @@ diff -uNrp a/plugins/media-keys/mpris-controller.c b/plugins/media-keys/mpris-co
 +  if (!priv->mpris_client_proxy)
 +    g_warning ("Error connecting to mpris interface %s", error->message);
 +
++  priv->connecting = FALSE;
++
 +  g_clear_error (&error);
 +}
 +
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index fb388b4..b3c2d03 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon-settings-daemon
 Version:        2.0.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -134,6 +134,9 @@ fi
 
 
 %changelog
+* Fri Apr 18 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-6
+- add mpris pause fix
+
 * Thu Mar 06 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-5
 - Fix DPMS issue with Xorg 1.14
 


More information about the scm-commits mailing list