[gdm/wip/wayland-for-merge: 4/21] server: Pull out common X server args

[Jasper St. Pierre <jstpierre src gnome org>]

commit 0e2336a372864520aea08cf83c90cf129596c050
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Mar 7 08:38:27 2014 -0500

    server: Pull out common X server args

 daemon/gdm-server.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 250ecc6..b58f2b0 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -270,6 +270,8 @@ gdm_server_init_command (GdmServer *server)
                 debug_options = "";
         }
 
+#define X_SERVER_ARG_FORMAT " -background none -verbose %s%s"
+
 #ifdef WITH_SYSTEMD
 
         /* This is a temporary hack to work around the fact that XOrg
@@ -308,13 +310,13 @@ gdm_server_init_command (GdmServer *server)
                 goto fallback;
         }
 
-        server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER " -background none -verbose %s%s", 
verbosity, debug_options);
+        server->priv->command = g_strdup_printf (SYSTEMD_X_SERVER X_SERVER_ARG_FORMAT, verbosity, 
debug_options);
         return;
 
 fallback:
 #endif
 
-        server->priv->command = g_strdup_printf (X_SERVER " -background none -verbose %s%s", verbosity, 
debug_options);
+        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
 }
 
 static gboolean