Merge lp:~ubuntu-multiseat/lightdm/drop-sharevts into lp:lightdm

[Laércio de Sousa]

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

[Robert Ancell (robert-ancell)]

Does this mean LightDM will break with X servers < 1.16? Unfortunately we don't know what version of Xorg we are using so I'm wary about breaking older systems.

[Laércio de Sousa (lbssousa)]

It _would_ potentially break with "old Xorg server + new LightDM + systemd-based multi-seat setup", which, I believe, is a very rare combination nowadays.

The only special case in my mind is Trusty, which ships xorg-server 1.15.1 by default. However, this package has received backported patches from 1.16 in trusty-updates repo, so it doesn't need -sharevts, too.

[Robert Ancell (robert-ancell)]

I was thinking of other distributions using LightDM. But yeah, I suspect this combination is rare and supporting less code is nice. I updated the branch to also fix the tests.

review: Approve

=== modified file 'src/seat-xlocal.c'
--- src/seat-xlocal.c	2015-07-28 08:38:40 +0000
+++ src/seat-xlocal.c	2015-08-13 14:01:00 +0000
@@ -198,8 +198,6 @@
         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)

=== modified file 'src/x-server-local.c'
--- src/x-server-local.c	2015-05-26 02:08:20 +0000
+++ src/x-server-local.c	2015-08-13 14:01:00 +0000
@@ -40,9 +40,6 @@
     /* 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 @@
 }
 
 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 @@
     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);

=== modified file 'src/x-server-local.h'
--- src/x-server-local.h	2014-09-19 03:16:14 +0000
+++ src/x-server-local.h	2015-08-13 14:01:00 +0000
@@ -51,8 +51,6 @@
 
 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);