[SCM] mate-settings-daemon Debian package branch, master, updated. debian/1.8.1-2-7-ga0c7f6b

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-settings-daemon.git;a=commitdiff;h=f1c0e28

The following commit has been merged in the master branch:
commit f1c0e28dacbfcebf85e0f9028d1665d42cfedb29
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 13:30:49 2014 +0200

    debian/patches: Add 0001_prefer-gcalculator-for-media-keys.patch. Prefer gcalculator as pocket calculator when the calculator media key is pressed.
---
 .../0001_prefer-gcalculator-for-media-keys.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/0001_prefer-gcalculator-for-media-keys.patch b/debian/patches/0001_prefer-gcalculator-for-media-keys.patch
new file mode 100644
index 0000000..444a36b
--- /dev/null
+++ b/debian/patches/0001_prefer-gcalculator-for-media-keys.patch
@@ -0,0 +1,25 @@
+From 163f01a8b527c1ed801f68681fc7d82a54d42b1c Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Wed, 8 Oct 2014 13:42:12 +0200
+Subject: [PATCH] media-keys: Use galculator first
+
+---
+ plugins/media-keys/msd-media-keys-manager.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
+index ad7665d..cc819c5 100644
+--- a/plugins/media-keys/msd-media-keys-manager.c
++++ b/plugins/media-keys/msd-media-keys-manager.c
+@@ -999,7 +999,9 @@ do_action (MsdMediaKeysManager *manager,
+                 do_media_action (manager);
+                 break;
+         case CALCULATOR_KEY:
+-                if ((cmd = g_find_program_in_path ("mate-calc"))) {
++                if ((cmd = g_find_program_in_path ("galculator"))) {
++                        execute (manager, "galculator", FALSE, FALSE);
++                } else if ((cmd = g_find_program_in_path ("mate-calc"))) {
+                         execute (manager, "mate-calc", FALSE, FALSE);
+                 } else {
+                         execute (manager, "gcalctool", FALSE, FALSE);
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..560fb51
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001_prefer-gcalculator-for-media-keys.patch
+

-- 
mate-settings-daemon Debian package