]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Drop Xorg option -sharevts. It's no longer required for non-seat0 X servers since...
authorRobert Ancell <robert.ancell@canonical.com>
Sun, 16 Aug 2015 22:05:00 +0000 (10:05 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Sun, 16 Aug 2015 22:05:00 +0000 (10:05 +1200)
See http://cgit.freedesktop.org/xorg/xserver/commit/?id=46cf2

1  2 
tests/scripts/multi-seat-change-graphical-disabled.conf
tests/scripts/multi-seat-change-graphical.conf
tests/scripts/multi-seat-globbing-config-sections.conf
tests/scripts/multi-seat-non-graphical-disabled.conf
tests/scripts/multi-seat.conf
tests/src/X.c
tests/src/Xmir.c

index 2fdd9fc5ffd177710c4796c84f15feaff0c51cbd,2fdd9fc5ffd177710c4796c84f15feaff0c51cbd..3b3369fc6f5f102a358c73edf77c1f7ea00e3d09
@@@ -21,7 -21,7 +21,7 @@@
  #?*ADD-SEAT ID=seat1
  
  # seat1 starts
--#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seat1
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
index b818d4794a5d4304a97fa4963998255b8959ea44,b818d4794a5d4304a97fa4963998255b8959ea44..8c2bded77e19205705f2f75dbae52629791437f9
@@@ -24,7 -24,7 +24,7 @@@ logind-check-graphical=tru
  #?*ADD-SEAT ID=seat1
  
  # seat1 starts
--#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seat1
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
@@@ -46,7 -46,7 +46,7 @@@
  #?*UPDATE-SEAT ID=seat1 CAN-GRAPHICAL=TRUE
  
  # seat1 starts
--#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seat1
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
index 3109e649dc7a992369be34d6078c8b384dfdb6f0,3109e649dc7a992369be34d6078c8b384dfdb6f0..044dd43cfcd9132b589560266cadb9a94e94f88d
@@@ -34,7 -34,7 +34,7 @@@ autologin-user=have-password
  #?*ADD-SEAT ID=seatAAAFoo
  
  # seatAAAFoo starts
--#?XSERVER-1 START SEAT=seatAAAFoo SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seatAAAFoo
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
@@@ -66,7 -66,7 +66,7 @@@
  #?*ADD-SEAT ID=seatBBBFoo
  
  # seatBBBFoo starts
--#?XSERVER-2 START SEAT=seatBBBFoo SHAREVTS=TRUE
++#?XSERVER-2 START SEAT=seatBBBFoo
  #?*XSERVER-2 INDICATE-READY
  #?XSERVER-2 INDICATE-READY
  #?XSERVER-2 ACCEPT-CONNECT
index 2dea15f757db992a8d576b75b3f330695f8d11f7,2dea15f757db992a8d576b75b3f330695f8d11f7..f8371c0050ae161543dfdfc05f2fadadf7c3d282
@@@ -21,7 -21,7 +21,7 @@@
  #?*ADD-SEAT ID=seat1 CAN-GRAPHICAL=FALSE
  
  # seat1 starts
--#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seat1
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
index 219393b5fe29ce8cdd5a189884c1433de7320233,219393b5fe29ce8cdd5a189884c1433de7320233..1589d2b1f388e575eafdefa59796521c330d68f9
@@@ -21,7 -21,7 +21,7 @@@
  #?*ADD-SEAT ID=seat1
  
  # seat1 starts
--#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
++#?XSERVER-1 START SEAT=seat1
  #?*XSERVER-1 INDICATE-READY
  #?XSERVER-1 INDICATE-READY
  #?XSERVER-1 ACCEPT-CONNECT
diff --cc tests/src/X.c
index 2ad77b21fd5dbaf3d5e67663db5ff07c4ae51cb8,2ad77b21fd5dbaf3d5e67663db5ff07c4ae51cb8..c8865af94363bef621853799c0ea955c4817595e
@@@ -205,7 -205,7 +205,6 @@@ main (int argc, char **argv
      gchar *seat = NULL;
      gchar *mir_id = NULL;
      gchar *lock_filename;
--    gboolean sharevts = FALSE;
      int lock_file;
      GString *status_text;
  
              seat = argv[i+1];
              i++;
          }
--        else if (strcmp (arg, "-sharevts") == 0)
--        {
--            sharevts = TRUE;
--        }
          else if (strcmp (arg, "-mir") == 0)
          {
              mir_id = argv[i+1];
                          "-broadcast             Broadcast for XDMCP\n"
                          "-port port-num         UDP port number to send messages to\n"
                          "-seat string           seat to run on\n"
--                        "-sharevts              share VTs with another X server\n"
                          "-mir id                Mir ID to use\n"
                          "-mirSocket name        Mir socket to use\n"
                          "vtxx                   Use virtual terminal xx instead of the next available\n",
          g_string_append_printf (status_text, " VT=%d", vt_number);
      if (seat != NULL)
          g_string_append_printf (status_text, " SEAT=%s", seat);
--    if (sharevts)
--        g_string_append (status_text, " SHAREVTS=TRUE");
      if (mir_id != NULL)
          g_string_append_printf (status_text, " MIR-ID=%s", mir_id);
      status_notify ("%s", status_text->str);
index 8220a51e95182d54d04746f4de5f3d6b4b0dda1c,8220a51e95182d54d04746f4de5f3d6b4b0dda1c..5baa492150444ef01965ba653d1b9e33b42b1757
@@@ -119,7 -119,7 +119,6 @@@ main (int argc, char **argv
      gchar *seat = NULL;
      gchar *mir_id = NULL;
      gchar *lock_filename;
--    gboolean sharevts = FALSE;
      int lock_file;
      GString *status_text;
  
              seat = argv[i+1];
              i++;
          }
--        else if (strcmp (arg, "-sharevts") == 0)
--        {
--            sharevts = TRUE;
--        }
          else if (strcmp (arg, "-mir") == 0)
          {
              mir_id = argv[i+1];
                          "-background [none]     Create root window with no background\n"
                          "-nr                    (Ubuntu-specific) Synonym for -background none\n"
                          "-seat string           seat to run on\n"
--                        "-sharevts              share VTs with another X server\n"
                          "-mir id                Mir ID to use\n"
                          "-mirSocket name        Mir socket to use\n"
                          "vtxx                   Use virtual terminal xx instead of the next available\n",
          g_string_append_printf (status_text, " VT=%d", vt_number);
      if (seat != NULL)
          g_string_append_printf (status_text, " SEAT=%s", seat);
--    if (sharevts)
--        g_string_append (status_text, " SHAREVTS=TRUE");
      if (mir_id != NULL)
          g_string_append_printf (status_text, " MIR-ID=%s", mir_id);
      status_notify ("%s", status_text->str);