[mutter/wip/carlosg/xwayland-startup-side-channel: 2/5] xwayland: Refactor Xwayland spawn command

[Carlos Garnacho <carlosg src gnome org>]

commit 5bddc264d452f1d4014a68c5ebdb24af4e4132bb
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Nov 15 14:31:46 2019 +0100

    xwayland: Refactor Xwayland spawn command
    
    We may want to try different arguments here, so make it easier
    to adapt in the future.

 src/wayland/meta-xwayland.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index f1ad12aa3..1ea9df7e6 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -621,6 +621,18 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager)
   g_autoptr(GSubprocessLauncher) launcher = NULL;
   GSubprocessFlags flags;
   GError *error = NULL;
+  const char *args [] = {
+    XWAYLAND_PATH, manager->display_name,
+    "-rootless",
+    "-noreset",
+    "-accessx",
+    "-core",
+    "-auth", manager->auth_file,
+    "-listen", "4",
+    "-listen", "5",
+    "-displayfd", "6",
+    NULL
+  };
 
   /* We want xwayland to be a wayland client so we make a socketpair to setup a
    * wayland protocol connection. */
@@ -654,17 +666,8 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager)
 
   g_subprocess_launcher_setenv (launcher, "WAYLAND_SOCKET", "3", TRUE);
 
-  manager->proc = g_subprocess_launcher_spawn (launcher, &error,
-                                               XWAYLAND_PATH, manager->display_name,
-                                               "-rootless",
-                                               "-noreset",
-                                               "-accessx",
-                                               "-core",
-                                               "-auth", manager->auth_file,
-                                               "-listen", "4",
-                                               "-listen", "5",
-                                               "-displayfd", "6",
-                                               NULL);
+  manager->proc = g_subprocess_launcher_spawnv (launcher, args, &error);
+
   if (!manager->proc)
     {
       g_error ("Failed to spawn Xwayland: %s", error->message);