[mate-settings-daemon] 10/25: Drop 0001_prefer-gcalculator-for-media-keys.patch. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-settings-daemon.

commit a12773d4fe4f4ab251da8fc9dfedcaf0f3559f55
Author: Martin Wimpress <code at flexion.org>
Date:   Fri Jun 12 14:04:49 2015 +0100

    Drop 0001_prefer-gcalculator-for-media-keys.patch. Applied upstream.
---
 .../0001_prefer-gcalculator-for-media-keys.patch   | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/debian/patches/0001_prefer-gcalculator-for-media-keys.patch b/debian/patches/0001_prefer-gcalculator-for-media-keys.patch
deleted file mode 100644
index 444a36b..0000000
--- a/debian/patches/0001_prefer-gcalculator-for-media-keys.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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);
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-settings-daemon.git