diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/lightdm.c | 7 | ||||
| -rw-r--r-- | tests/src/test-runner.c | 19 | ||||
| -rwxr-xr-x | tests/test-autologin | 2 | ||||
| -rwxr-xr-x | tests/test-autologin-guest | 2 | ||||
| -rwxr-xr-x | tests/test-headless | 2 | ||||
| -rwxr-xr-x | tests/test-script-hook-fail-display-setup | 2 |
8 files changed, 21 insertions, 26 deletions
@@ -6,8 +6,9 @@ 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, --minimum-display-number - options + * Remove unused --user-session, --greeter-session, --minimum-vt, + --minimum-display-number options + * Use 'default' as the default greeter (make a symlink) Overview of changes in lightdm 1.0.0 diff --git a/configure.ac b/configure.ac index 25cb83d7..ae859b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -131,13 +131,7 @@ AC_ARG_WITH(user-session, AC_SUBST(USER_SESSION) AC_DEFINE_UNQUOTED(USER_SESSION, "$USER_SESSION", User session) -if test $have_gtk = yes; then -GREETER_SESSION=lightdm-gtk-greeter -elif test $have_qt = yes; then -GREETER_SESSION=lightdm-qt-greeter -else -GREETER_SESSION= -fi +GREETER_SESSION=default AC_ARG_WITH(greeter-session, AS_HELP_STRING(--with-greeter-session=<session>, Greeter session), diff --git a/src/lightdm.c b/src/lightdm.c index ee48113e..283e0fc0 100644 --- a/src/lightdm.c +++ b/src/lightdm.c @@ -749,7 +749,6 @@ main (int argc, char **argv) gchar *pid_path = "/var/run/lightdm.pid"; gchar *xsessions_dir = NULL; gchar *xgreeters_dir = NULL; - gchar *greeter_session = NULL; gchar *config_dir; gchar *log_dir = NULL; gchar *run_dir = NULL; @@ -772,9 +771,6 @@ main (int argc, char **argv) { "pid-file", 0, 0, G_OPTION_ARG_STRING, &pid_path, /* Help string for command line --pid-file flag */ N_("File to write PID into"), "FILE" }, - { "greeter-session", 0, 0, G_OPTION_ARG_STRING, &greeter_session, - /* Help string for command line --greeter-session flag */ - N_("Greeter session"), "SESSION" }, { "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" }, @@ -963,9 +959,6 @@ main (int argc, char **argv) if (xgreeters_dir) config_set_string (config_get_instance (), "LightDM", "xgreeters-directory", xgreeters_dir); g_free (xgreeters_dir); - if (greeter_session) - config_set_string (config_get_instance (), "SeatDefaults", "greeter-session", greeter_session); - g_free (greeter_session); /* Create run and cache directories */ g_mkdir_with_parents (config_get_string (config_get_instance (), "LightDM", "log-directory"), S_IRWXU | S_IXGRP | S_IXOTH); diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c index 0143390e..0c62b8f8 100644 --- a/tests/src/test-runner.c +++ b/tests/src/test-runner.c @@ -481,9 +481,9 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, FALSE); - if (argc != 2 && argc != 3) + if (argc != 3) { - g_printerr ("Usage %s SCRIPT-NAME [GREETER]\n", argv[0]); + g_printerr ("Usage %s SCRIPT-NAME GREETER\n", argv[0]); quit (EXIT_FAILURE); } script_name = argv[1]; @@ -491,8 +491,17 @@ main (int argc, char **argv) config_path = g_build_filename (SRCDIR, "tests", "scripts", config_file, NULL); g_free (config_file); - if (argc == 3) - greeter = argv[2]; + /* Link to the correct greeter */ + greeter = argv[2]; + path = g_build_filename (SRCDIR, "tests", "data", "xgreeters", "default.desktop", NULL); + path1 = g_strdup_printf ("%s.desktop", greeter); + if (unlink (path) < 0 || symlink (path1, path) < 0) + { + g_printerr ("Failed to make greeter symlink %s->%s: %s\n", path, path1, strerror (errno)); + quit (EXIT_FAILURE); + } + g_free (path); + g_free (path1); config = g_key_file_new (); g_key_file_load_from_file (config, config_path, G_KEY_FILE_NONE, NULL); @@ -606,8 +615,6 @@ main (int argc, char **argv) g_string_append (command_line, " --debug"); if (config_path) g_string_append_printf (command_line, " --config %s", config_path); - if (greeter) - g_string_append_printf (command_line, " --greeter-session=%s", greeter); 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); diff --git a/tests/test-autologin b/tests/test-autologin index 373bd444..7e84b716 100755 --- a/tests/test-autologin +++ b/tests/test-autologin @@ -1,2 +1,2 @@ #!/bin/sh -./src/test-runner autologin +./src/test-runner autologin test-gobject-greeter diff --git a/tests/test-autologin-guest b/tests/test-autologin-guest index 14feab62..44ecebce 100755 --- a/tests/test-autologin-guest +++ b/tests/test-autologin-guest @@ -1,2 +1,2 @@ #!/bin/sh -./src/test-runner autologin-guest +./src/test-runner autologin-guest test-gobject-greeter diff --git a/tests/test-headless b/tests/test-headless index bf74006a..5d1412c6 100755 --- a/tests/test-headless +++ b/tests/test-headless @@ -1,2 +1,2 @@ #!/bin/sh -./src/test-runner headless +./src/test-runner headless test-gobject-greeter diff --git a/tests/test-script-hook-fail-display-setup b/tests/test-script-hook-fail-display-setup index 812174b5..0ef791b1 100755 --- a/tests/test-script-hook-fail-display-setup +++ b/tests/test-script-hook-fail-display-setup @@ -1,2 +1,2 @@ #!/bin/sh -./src/test-runner script-hook-fail-display-setup +./src/test-runner script-hook-fail-display-setup test-gobject-greeter |