[mutter/wayland] xwayland: Shut up conditionally
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] xwayland: Shut up conditionally
- Date: Tue, 25 Mar 2014 16:54:28 +0000 (UTC)
commit d699b2409ae0c5fadd3ef3124aaea8ebe1480e78
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Mar 25 12:41:52 2014 -0400
xwayland: Shut up conditionally
src/wayland/meta-xwayland.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 20b86b4..8c0fe35 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -372,14 +372,22 @@ meta_xwayland_start (MetaXWaylandManager *manager,
"-nolisten",
"all",
NULL };
+ int flags = 0;
+
+ flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
+ flags |= G_SPAWN_DO_NOT_REAP_CHILD;
+
+ /* xwayland, please. */
+ if (getenv ("XWAYLAND_STFU"))
+ {
+ flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
+ flags |= G_SPAWN_STDERR_TO_DEV_NULL;
+ }
if (g_spawn_async (NULL, /* cwd */
args,
env,
- G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
- G_SPAWN_DO_NOT_REAP_CHILD |
- G_SPAWN_STDOUT_TO_DEV_NULL |
- G_SPAWN_STDERR_TO_DEV_NULL,
+ flags,
uncloexec,
GINT_TO_POINTER (sp[1]),
&pid,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]