From c2869268d89c18ce6332c8dec4e30b7d74f0e130 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 5 Jul 2022 12:48:19 +0100 Subject: [PATCH] term list - move to a single file to list possible terminal desktops --- src/bin/e_inc_terms.h | 5 +++++ src/bin/e_utils.c | 6 +----- src/bin/tools/open/e_open.c | 6 +----- src/bin/tools/open/meson.build | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 src/bin/e_inc_terms.h diff --git a/src/bin/e_inc_terms.h b/src/bin/e_inc_terms.h new file mode 100644 index 000000000..4433010d8 --- /dev/null +++ b/src/bin/e_inc_terms.h @@ -0,0 +1,5 @@ +"terminology.desktop", +"xterm.desktop", +"rxvt.desktop", +"gnome-terminal.desktop", +"konsole.desktop", diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index c7975a0f6..6ccbcd831 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -1174,11 +1174,7 @@ e_util_terminal_desktop_get(void) { const char *terms[] = { - "terminology.desktop", - "xterm.desktop", - "rxvt.desktop", - "gnome-terminal.desktop", - "konsole.desktop", +#include "e_inc_terms.h" NULL }; const char *s; diff --git a/src/bin/tools/open/e_open.c b/src/bin/tools/open/e_open.c index a7fb35e7d..ca4b1d9b3 100644 --- a/src/bin/tools/open/e_open.c +++ b/src/bin/tools/open/e_open.c @@ -178,11 +178,7 @@ terminal_open(void) { const char *terms[] = { - "terminology.desktop", - "xterm.desktop", - "rxvt.desktop", - "gnome-terimnal.desktop", - "konsole.desktop", +#include "e_inc_terms.h" NULL }; const char *s; diff --git a/src/bin/tools/open/meson.build b/src/bin/tools/open/meson.build index a9e1dde2b..117986b53 100644 --- a/src/bin/tools/open/meson.build +++ b/src/bin/tools/open/meson.build @@ -1,6 +1,6 @@ executable('enlightenment_open', [ 'e_open.c' ], - include_directories: include_directories('../../../..'), + include_directories: include_directories('../../../..', '../..'), dependencies : [ dep_eina, dep_ecore, dep_efreet, dep_efreet_mime ], install_dir : dir_bin, install : true