Remove unused --minimum-display-number option

44 files changed, 109 insertions, 16 deletions

diff --git a/NEWS b/NEWS
index 72739575..1939e8d2 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,8 @@ Overview of changes in lightdm 1.1.0
     * Removed the --passwd-file option as not required for testing anymore
     * Rename test-xserver to X and remove --xserver-command option
     * Make a test session wrapper and remove --session-wrapper option
-    * Remove unused --user-session, --minimum-vt options
+    * Remove unused --user-session, --minimum-vt, --minimum-display-number
+      options
 
 Overview of changes in lightdm 1.0.0
 
diff --git a/src/lightdm.c b/src/lightdm.c
index 31c96edf..ee48113e 100644
--- a/src/lightdm.c
+++ b/src/lightdm.c
@@ -757,7 +757,6 @@ main (int argc, char **argv)
     gchar *default_log_dir = g_strdup (LOG_DIR);
     gchar *default_run_dir = g_strdup (RUN_DIR);
     gchar *default_cache_dir = g_strdup (CACHE_DIR);
-    gchar *minimum_display_number = NULL;
     gboolean show_version = FALSE;
     GOptionEntry options[] = 
     {
@@ -776,9 +775,6 @@ main (int argc, char **argv)
         { "greeter-session", 0, 0, G_OPTION_ARG_STRING, &greeter_session,
           /* Help string for command line --greeter-session flag */
           N_("Greeter session"), "SESSION" },
-        { "minimum-display-number", 0, 0, G_OPTION_ARG_STRING, &minimum_display_number,
-          /* Help string for command line --minimum-display-number flag */
-          N_("Minimum display number to use for X servers"), "NUMBER" },
         { "xsessions-dir", 0, 0, G_OPTION_ARG_STRING, &xsessions_dir,
           /* Help string for command line --xsessions-dir flag */
           N_("Directory to load X sessions from"), "DIRECTORY" },
@@ -952,9 +948,6 @@ main (int argc, char **argv)
         config_set_string (config_get_instance (), "LightDM", "xgreeters-directory", XGREETERS_DIR);
 
     /* Override defaults */
-    if (minimum_display_number)
-        config_set_integer (config_get_instance (), "LightDM", "minimum-display-number", atoi (minimum_display_number));
-    g_free (minimum_display_number);
     if (log_dir)
         config_set_string (config_get_instance (), "LightDM", "log-directory", log_dir);
     g_free (log_dir);
diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index 6818488d..0cd31819 100644
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=false
+minimum-display-number=50
 
 [SeatDefaults]
 autologin-guest=true
diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 5e67e35a..72c9b9ad 100644
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=test-guest-account
+minimum-display-number=50
 
 [SeatDefaults]
 autologin-guest=true
diff --git a/tests/scripts/autologin-guest.conf b/tests/scripts/autologin-guest.conf
index 0ff46a95..3d665f30 100644
--- a/tests/scripts/autologin-guest.conf
+++ b/tests/scripts/autologin-guest.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=test-guest-account
+minimum-display-number=50
 
 [SeatDefaults]
 autologin-guest=true
diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index a8c06beb..ed1cb2cc 100644
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -2,6 +2,9 @@
 # Check can login
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 user-session=invalid
diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index 87fd4a09..f06d024f 100644
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=invalid
 
diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 78c5f540..05842bd8 100644
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -2,6 +2,9 @@
 # Check logging out after autologin returns to greeter and doesn't autologin again
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index 70499849..57ea08f7 100644
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -2,6 +2,9 @@
 # Check if session crashes then returned to greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index 200fdea5..a5dbdf27 100644
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -2,6 +2,9 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 492adcb5..16bd339a 100644
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -2,6 +2,9 @@
 # Check automatically logs in default user
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index 214e60bf..7a047a93 100644
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -2,6 +2,9 @@
 # Check that LightDM quits when the greeter fails to start
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 return-value=1
 
diff --git a/tests/scripts/greeter-not-installed.conf b/tests/scripts/greeter-not-installed.conf
index 25b2c224..7cf0e8fe 100644
--- a/tests/scripts/greeter-not-installed.conf
+++ b/tests/scripts/greeter-not-installed.conf
@@ -2,6 +2,9 @@
 # Check that LightDM quits when the greeter does not exist
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 return-value=1
 
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 40896335..4415140d 100644
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -2,6 +2,9 @@
 # Check X server crashing while running greeter returns to the greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 crash-xserver=true
 
diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index f5e757ff..1b7d949c 100644
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -2,6 +2,9 @@
 # Check can't login to guest if account disabled
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 allow-guest=false
 
diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index d5cdb3b2..4f80eca4 100644
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=false
+minimum-display-number=50
 
 [test-greeter-config]
 login-guest=true
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 83cf76ea..5ef6c2cd 100644
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=test-guest-account
+minimum-display-number=50
 
 [test-greeter-config]
 login-guest=true
diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
index 74bebb8c..58b034cf 100644
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=
+minimum-display-number=50
 
 [test-greeter-config]
 login-guest=true
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 4dca5439..f444bea7 100644
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=test-guest-account
+minimum-display-number=50
 
 [test-greeter-config]
 login-guest=true
diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index baa3503a..0673d3a8 100644
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -2,6 +2,9 @@
 # Check can login
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=alice
 password=password
diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index dd10388a..ef65986f 100644
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -2,6 +2,9 @@
 # Check can't login with invalid user (but still prompted for password)
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=notauser
 password=password
diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 31ecb3a6..281b92b3 100644
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -2,6 +2,9 @@
 # Check logging out returns to the greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=alice
 password=password
diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index 7f7622af..b83c60db 100644
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -2,6 +2,9 @@
 # Check can login without a username, and is prompted for one
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 prompt-username=true
 username=alice
diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index abb7ebfc..2c59e82f 100644
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -2,6 +2,9 @@
 # Check can login without password for accounts that do not have a password
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=bob
 
diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index 7c4c6c04..39629858 100644
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -2,6 +2,9 @@
 # Check if session crashes then returned to greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-session-config]
 sigsegv=true
 
diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index 6ae718b6..7aecdae4 100644
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -2,6 +2,9 @@
 # Check can't login with an invalid password
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=alice
 password=rubbish
diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 71bdb7c2..0e6e7401 100644
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -2,6 +2,9 @@
 # Check LightDM returns to the greeter if the X server crashes inside a session
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-session-config]
 crash-xserver=true
 
diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index c7cc9d27..4b2edb60 100644
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -2,6 +2,9 @@
 # Check can login
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=alice
 password=password
diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
index c4b6bc85..27a98f66 100644
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -8,23 +8,23 @@ have-config=false
 #?RUNNER DAEMON-START
 
 # One X server should start by default
-#?XSERVER :50 START
-#?XSERVER :50 INDICATE-READY
+#?XSERVER :.* START
+#?XSERVER :.* INDICATE-READY
 
 # LightDM connects to X server
-#?XSERVER :50 ACCEPT-CONNECT
+#?XSERVER :.* ACCEPT-CONNECT
 
 # Greeter starts
 #?GREETER START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER CONNECT-XSERVER :50
+#?XSERVER :.* ACCEPT-CONNECT
+#?GREETER CONNECT-XSERVER :.*
 #?GREETER CONNECT-TO-DAEMON
 #?GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+#?(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
 #?RUNNER DAEMON-EXIT STATUS=0
 
diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
index c97ee9a0..608804fe 100644
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -2,6 +2,9 @@
 # Check Plymouth quits when X server is started.  Plymouth is on an active VT so it handshakes with the X server.
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-plymouth-config]
 enabled=true
 has-active-vt=true
diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index 011fa926..81c8375d 100644
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -2,6 +2,9 @@
 # Check Plymouth quits when X server is started.  Plymouth is on an inactive VT so it quits immediately.
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-plymouth-config]
 enabled=true
 active=true
diff --git a/tests/scripts/plymouth-no-seat.conf b/tests/scripts/plymouth-no-seat.conf
index 5e5d5d25..3cd081f3 100644
--- a/tests/scripts/plymouth-no-seat.conf
+++ b/tests/scripts/plymouth-no-seat.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 start-default-seat=false
+minimum-display-number=50
 
 [test-plymouth-config]
 enabled=true
diff --git a/tests/scripts/script-hook-fail-display-setup.conf b/tests/scripts/script-hook-fail-display-setup.conf
index 14850e5c..a2ad5771 100644
--- a/tests/scripts/script-hook-fail-display-setup.conf
+++ b/tests/scripts/script-hook-fail-display-setup.conf
@@ -2,6 +2,9 @@
 # Check LightDM stops the display if the display setup script returns an error
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 display-setup-script=test-script-hook DISPLAY-SETUP 1
 
diff --git a/tests/scripts/script-hook-fail-greeter-setup.conf b/tests/scripts/script-hook-fail-greeter-setup.conf
index 18b2d335..ce344c3b 100644
--- a/tests/scripts/script-hook-fail-greeter-setup.conf
+++ b/tests/scripts/script-hook-fail-greeter-setup.conf
@@ -2,6 +2,9 @@
 # Check LightDM stops the display if the display setup script returns an error
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 greeter-setup-script=test-script-hook GREETER-SETUP 1
 
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
index f9a5a6ab..e6da4b3b 100644
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -2,6 +2,9 @@
 # Check LightDM stops returns to the greeter if the session setup script fails
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 session-setup-script=test-script-hook SESSION-SETUP 1
 autologin-user=alice
diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index bd3a4800..d6b35f50 100644
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -2,6 +2,9 @@
 # Check LightDM runs the script hooks correctly for autologin and the greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 display-setup-script=test-script-hook DISPLAY-SETUP
 greeter-setup-script=test-script-hook GREETER-SETUP
diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index a75135c1..584a0bcc 100644
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -2,6 +2,9 @@
 # Use D-Bus interface to show the greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [test-greeter-config]
 username=alice
 password=password
diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index f09c4397..a1e56da0 100644
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 guest-account-script=test-guest-account
+minimum-display-number=50
 
 [SeatDefaults]
 autologin-user=alice
diff --git a/tests/scripts/switch-to-user-existing-session.conf b/tests/scripts/switch-to-user-existing-session.conf
index 5ef82e13..8d6b65e0 100644
--- a/tests/scripts/switch-to-user-existing-session.conf
+++ b/tests/scripts/switch-to-user-existing-session.conf
@@ -2,6 +2,9 @@
 # Check that switching to an existing user does nothing
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/switch-to-user-no-password.conf b/tests/scripts/switch-to-user-no-password.conf
index a65b10a5..070fd213 100644
--- a/tests/scripts/switch-to-user-no-password.conf
+++ b/tests/scripts/switch-to-user-no-password.conf
@@ -2,6 +2,9 @@
 # Check that switching to a user without a password doesn't show a greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=alice
 
diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index eebcb53b..510f666a 100644
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -2,6 +2,9 @@
 # Check that switching to a user shows the greeter
 #
 
+[LightDM]
+minimum-display-number=50
+
 [SeatDefaults]
 autologin-user=bob
 
diff --git a/tests/scripts/xdmcp-login.conf b/tests/scripts/xdmcp-login.conf
index c8bde0c8..17ac8327 100644
--- a/tests/scripts/xdmcp-login.conf
+++ b/tests/scripts/xdmcp-login.conf
@@ -4,6 +4,7 @@
 
 [LightDM]
 start-default-seat=false
+minimum-display-number=50
 
 [XDMCPServer]
 enabled=true
diff --git a/tests/scripts/xserver-fail-start.conf b/tests/scripts/xserver-fail-start.conf
index 4aadf26a..883f60a6 100644
--- a/tests/scripts/xserver-fail-start.conf
+++ b/tests/scripts/xserver-fail-start.conf
@@ -1,6 +1,9 @@
 #
 # Check that LightDM handles an X server that fails to start.
 #
+[LightDM]
+minimum-display-number=50
+
 [test-xserver-config]
 return-value=1
 
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 6e3b52c6..0143390e 100644
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -611,7 +611,6 @@ main (int argc, char **argv)
     g_string_append_printf (command_line, " --cache-dir %s/cache", temp_dir);
     g_string_append_printf (command_line, " --xsessions-dir=%s/tests/data/xsessions", SRCDIR);
     g_string_append_printf (command_line, " --xgreeters-dir=%s/tests/data/xgreeters", SRCDIR);
-    g_string_append (command_line, " --minimum-display-number=50");
 
     g_print ("Start daemon with command: PATH=%s LD_PRELOAD=%s LD_LIBRARY_PATH=%s LIGHTDM_TEST_STATUS_SOCKET=%s DBUS_SESSION_BUS_ADDRESS=%s %s\n",
              g_getenv ("PATH"), g_getenv ("LD_PRELOAD"), g_getenv ("LD_LIBRARY_PATH"), g_getenv ("LIGHTDM_TEST_STATUS_SOCKET"), g_getenv ("DBUS_SESSION_BUS_ADDRESS"),