Skip to content

Commit c19fce3

Browse files
zhangxianwei8lukefromdc
authored andcommitted
media-keys: Execute default calculator application defined by schema
Signed-off-by: Zhang Xianwei <[email protected]>
1 parent da353f2 commit c19fce3

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

‎plugins/media-keys/msd-media-keys-manager.c‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,22 @@ do_media_action (MsdMediaKeysManager *manager)
526526
}
527527
}
528528

529+
static void
530+
do_calculator_action (MsdMediaKeysManager *manager)
531+
{
532+
GSettings *settings;
533+
char *calc;
534+
535+
settings = g_settings_new ("org.mate.applications-calculator");
536+
calc = g_settings_get_string (settings, "exec");
537+
538+
if (calc)
539+
execute (manager, calc, FALSE, FALSE);
540+
541+
g_free (calc);
542+
g_object_unref (settings);
543+
}
544+
529545
static void
530546
do_shutdown_action (MsdMediaKeysManager *manager)
531547
{
@@ -1245,15 +1261,7 @@ do_action (MsdMediaKeysManager *manager,
12451261
do_media_action (manager);
12461262
break;
12471263
case CALCULATOR_KEY:
1248-
if ((cmd = g_find_program_in_path ("galculator"))) {
1249-
execute (manager, "galculator", FALSE, FALSE);
1250-
} else if ((cmd = g_find_program_in_path ("mate-calc"))) {
1251-
execute (manager, "mate-calc", FALSE, FALSE);
1252-
} else {
1253-
execute (manager, "gnome-calculator", FALSE, FALSE);
1254-
}
1255-
1256-
g_free (cmd);
1264+
do_calculator_action (manager);
12571265
break;
12581266
case PLAY_KEY:
12591267
return do_multimedia_player_action (manager, "Play");

0 commit comments

Comments
 (0)