Drop Xorg option -sharevts. It's no longer required for non-seat0 X servers since...

See http://cgit.freedesktop.org/xorg/xserver/commit/?id=46cf2

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index 74cf183ebc1c9b53536bf0c6b9afa323a9dba2b4..b930ba3227a6e846fba10ea4bfd5476ab6b57137 100644 (file)
--- 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 b6a55aa91704014f068bd763028422bd86d4c933..caff9b46e685c1c009423b7aca6ef8d62bc344cf 100644 (file)
--- 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;
 
@@ -218,13 +215,6 @@ x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat)
     server->priv->xdg_seat = g_strdup (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)
 {
@@ -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 23c1d9a96bce588dab8903d213d448ec57585b6d..7ed5732c86193bbc9ae59a4f49151491e30e3175 100644 (file)
--- 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);