[glib: 1/2] gdesktopappinfo: Return failure rather than blindly call xterm
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] gdesktopappinfo: Return failure rather than blindly call xterm
- Date: Fri, 17 Sep 2021 10:28:45 +0000 (UTC)
commit b60cd327fe307300ddbbe13971d99edc09a96079
Author: shironeko <shironeko tesaguri club>
Date: Thu Sep 9 10:32:44 2021 -0400
gdesktopappinfo: Return failure rather than blindly call xterm
Instead of calling xterm when it clearly does not exist and causes a silent error,
inform the user that the launch failed so they can take the right action.
gio/gdesktopappinfo.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 63ef0c045..229e62143 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]