luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 18:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio-launch-desktop: Don't alter stdout/stderr if not already the Journal

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-07-14 14:30:30 +01:00 committed by Philip Withnall
parent 6c3e52bb1d
commit f736414825
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gio-launch-desktop.c
View File

@ -47,6 +47,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include "gjournal-private.h"
/* /*
* write_all: * write_all:
* @fd: a file descriptor * @fd: a file descriptor
@ -189,6 +191,9 @@ set_up_journal (const char *argv1)
const char *slash; const char *slash;
int fd; int fd;
if (!_g_fd_is_journal (STDOUT_FILENO) && !_g_fd_is_journal (STDERR_FILENO))
return;
identifier = getenv ("GIO_LAUNCHED_DESKTOP_FILE"); identifier = getenv ("GIO_LAUNCHED_DESKTOP_FILE");
if (identifier == NULL) if (identifier == NULL)

8
gio/meson.build
View File

@ -400,8 +400,14 @@ if host_system != 'windows'
contenttype_sources += files('gcontenttype.c') contenttype_sources += files('gcontenttype.c')
appinfo_sources += files('gdesktopappinfo.c') appinfo_sources += files('gdesktopappinfo.c')
gio_unix_include_headers += files('gdesktopappinfo.h') gio_unix_include_headers += files('gdesktopappinfo.h')
launch_desktop_sources = files('gio-launch-desktop.c')
gio_launch_desktop = executable('gio-launch-desktop', 'gio-launch-desktop.c', if host_system == 'linux'
launch_desktop_sources += files('../glib/gjournal-private.c')
endif
gio_launch_desktop = executable('gio-launch-desktop', launch_desktop_sources,
include_directories : glibinc,
install : true, install : true,
install_dir : multiarch_libexecdir, install_dir : multiarch_libexecdir,
c_args : gio_c_args, c_args : gio_c_args,