Merge lp:~jbicha/unity-settings-daemon/fix-calculator-key into lp:unity-settings-daemon

[Jeremy Bícha]

Fix calculator keyboard key by adapting to gnome-calculator 3.24 .desktop rename (LP: #1676431)

[Jeremy Bícha (jbicha)]

This was fixed for gnome-settings-daemon with

https://launchpadlibrarian.net/312312021/gnome-settings-daemon_3.24.0-0ubuntu1_3.24.0-0ubuntu2.diff.gz

and

https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=ace15f5dc

[Jeremy Bícha (jbicha)]

https://bileto.ubuntu.com/#/ticket/2721

[Marco Trevisan (Treviño) (3v1n0)]

Tested with

  xdotool key XF86Calculator

This works properly. Approved, thanks.

review: Approve

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2016-05-20 17:01:02 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2017-04-18 12:03:24 +0000
@@ -2573,7 +2573,7 @@
                 do_media_action (manager, timestamp);
                 break;
         case CALCULATOR_KEY:
-                do_execute_desktop_or_desktop (manager, "gcalctool.desktop", "gnome-calculator.desktop", timestamp);
+                do_execute_desktop_or_desktop (manager, "org.gnome.Calculator.desktop", "gnome-calculator.desktop", timestamp);
                 break;
         case PLAY_KEY:
                 return do_multimedia_player_action (manager, NULL, "Play");