summaryrefslogtreecommitdiff
path: root/daemon/gdm-server.c
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-07 08:38:27 -0500
committerRay Strode <rstrode@redhat.com>2014-03-14 18:53:38 -0400
commitc95e9236d64811f254eb13accb9670e393bfee16 (patch)
tree1f32dae1ec853b4dd3c9ea95c3ca41e6de91df1a /daemon/gdm-server.c
parentf6f50e7e91d6fb48dc5015feaa390eaf5520cc80 (diff)
downloadgdm-c95e9236d64811f254eb13accb9670e393bfee16.tar.gz
server: Pull out common X server args
https://bugzilla.gnome.org/show_bug.cgi?id=726380
Diffstat (limited to 'daemon/gdm-server.c')
-rw-r--r--daemon/gdm-server.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 250ecc68..b58f2b0e 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