summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorStefano Karapetsas <stefano@karapetsas.com>2012-05-03 06:46:12 -0700
committerStefano Karapetsas <stefano@karapetsas.com>2012-05-03 06:46:12 -0700
commit43e7752536e4c78693a5520b6562e2081e9bbc52 (patch)
treeacecea403f07d43e416f4224ba986d7969cc378b /plugins
parent2275e121531db04c158811cc06b04a63b6d05979 (diff)
parent559fc8f95855dfe81dbafe9d3587b63cdec7b9dc (diff)
downloadmate-settings-daemon-43e7752536e4c78693a5520b6562e2081e9bbc52.tar.bz2
mate-settings-daemon-43e7752536e4c78693a5520b6562e2081e9bbc52.tar.xz
Merge pull request #5 from stefanct/master
media-keys: fix the "calculator key"
Diffstat (limited to 'plugins')
-rw-r--r--plugins/media-keys/msd-media-keys-manager.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c
index e7310c6..1ace064 100644
--- a/plugins/media-keys/msd-media-keys-manager.c
+++ b/plugins/media-keys/msd-media-keys-manager.c
@@ -1050,7 +1050,13 @@ do_action (MsdMediaKeysManager *manager,
do_media_action (manager);
break;
case CALCULATOR_KEY:
- execute (manager, "gcalctool", FALSE, FALSE);
+ if ((cmd = g_find_program_in_path ("mate-calc"))) {
+ execute (manager, "mate-calc", FALSE, FALSE);
+ } else {
+ execute (manager, "gcalctool", FALSE, FALSE);
+ }
+
+ g_free (cmd);
break;
case PLAY_KEY:
return do_multimedia_player_action (manager, "Play");