mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-27 07:56:14 +01:00
Merge branch 'main' into 'main'
gdesktopappinfo: Do not call xterm when it does not exist, inform the caller the launch failed See merge request GNOME/glib!2245
This commit is contained in:
commit
861afbe639
@ -2612,10 +2612,13 @@ prepend_terminal_to_vector (int *argc,
|
||||
check = g_find_program_in_path ("rxvt");
|
||||
if (check == NULL)
|
||||
check = g_find_program_in_path ("dtterm");
|
||||
if (check == NULL)
|
||||
check = g_find_program_in_path ("xterm");
|
||||
if (check == NULL)
|
||||
{
|
||||
check = g_strdup ("xterm");
|
||||
g_debug ("Couldn’t find a terminal: falling back to xterm");
|
||||
g_debug ("Couldn’t find a known terminal");
|
||||
g_free (term_argv);
|
||||
return FALSE;
|
||||
}
|
||||
term_argv[0] = check;
|
||||
term_argv[1] = g_strdup ("-e");
|
||||
|
Loading…
Reference in New Issue
Block a user