diff options
author | Laércio de Sousa <lbsousajr@gmail.com> | 2015-08-13 10:53:02 -0300 |
---|---|---|
committer | Laércio de Sousa <lbsousajr@gmail.com> | 2015-08-13 10:53:02 -0300 |
commit | 00757d32f1260a53d4fcb57b8fc9a898635198f0 (patch) | |
tree | 698653a13de0bebe370dd4250b3c2c357e7cd25a /src | |
parent | 887e816cb62b2eaeacb5fb764f0b3e5c9173fd55 (diff) | |
download | lightdm-00757d32f1260a53d4fcb57b8fc9a898635198f0.tar.gz |
Drop Xorg option -sharevts. It's no longer required for non-seat0 X servers since xorg-server release 1.16.
See http://cgit.freedesktop.org/xorg/xserver/commit/?id=46cf2
Diffstat (limited to 'src')
-rw-r--r-- | src/seat-xlocal.c | 2 | ||||
-rw-r--r-- | src/x-server-local.c | 13 | ||||
-rw-r--r-- | src/x-server-local.h | 2 |
3 files changed, 0 insertions, 17 deletions
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c index 74cf183e..b930ba32 100644 --- a/src/seat-xlocal.c +++ b/src/seat-xlocal.c @@ -198,8 +198,6 @@ create_x_server (Seat *seat) x_server_local_set_layout (x_server, layout); x_server_local_set_xdg_seat (x_server, seat_get_name (seat)); - if (strcmp (seat_get_name (seat), "seat0") != 0) - x_server_local_set_sharevts (x_server, TRUE); config_file = seat_get_string_property (seat, "xserver-config"); if (config_file) diff --git a/src/x-server-local.c b/src/x-server-local.c index b6a55aa9..caff9b46 100644 --- a/src/x-server-local.c +++ b/src/x-server-local.c @@ -40,9 +40,6 @@ struct XServerLocalPrivate /* Value for -seat argument */ gchar *xdg_seat; - /* TRUE if should share VT with other X server */ - gboolean sharevts; - /* TRUE if TCP/IP connections are allowed */ gboolean allow_tcp; @@ -219,13 +216,6 @@ x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat) } void -x_server_local_set_sharevts (XServerLocal *server, gboolean sharevts) -{ - g_return_if_fail (server != NULL); - server->priv->sharevts = sharevts; -} - -void x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp) { g_return_if_fail (server != NULL); @@ -473,9 +463,6 @@ x_server_local_start (DisplayServer *display_server) if (server->priv->xdg_seat) g_string_append_printf (command, " -seat %s", server->priv->xdg_seat); - if (server->priv->sharevts) - g_string_append (command, " -sharevts"); - write_authority_file (server); if (server->priv->authority_file) g_string_append_printf (command, " -auth %s", server->priv->authority_file); diff --git a/src/x-server-local.h b/src/x-server-local.h index 23c1d9a9..7ed5732c 100644 --- a/src/x-server-local.h +++ b/src/x-server-local.h @@ -51,8 +51,6 @@ void x_server_local_set_layout (XServerLocal *server, const gchar *layout); void x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat); -void x_server_local_set_sharevts (XServerLocal *server, gboolean sharevts); - void x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp); void x_server_local_set_xdmcp_server (XServerLocal *server, const gchar *hostname); |