Remove --greeter-session option

diff --git a/NEWS b/NEWS
index 1939e8d2a0a6d43ee904c99b2cb3766a27f02f95..0d83d5baa81395f6f708a8bd1da8c085965bbffa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 25cb83d776ea28531920c8ca8a29cfff8bde79d9..ae859b2d7e57eb81e1e841025d70967af8434abd 100644 (file)
--- 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 ee48113e4dd2cb61a33992582ac4934b23abc8cb..283e0fc05a286314780f78bf0b753ef162db7cc2 100644 (file)
--- 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 0143390e610c6cc9de308e05dfb4e728b82db341..0c62b8f84dbe7d3bcb18d625d8fdfca746a4f965 100644 (file)
--- 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 373bd4446bdcc7aaf5951346e1bed7eaf366b945..7e84b716407fc9e0db8757201003c1b173e7ee1b 100755 (executable)
--- 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 14feab62ccf365b367ecd2fdae5e9cf4397249d9..44ecebce2e7fd32b993474c6a7c45e5a10a80c2c 100755 (executable)
--- 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 bf74006a92e33cad57c2fdc2cc7e3090dd320e0b..5d1412c63c5fcad1db37ca63721e7d59ae6af9fc 100755 (executable)
--- 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 812174b562bce23d9de508474961f8f813303288..0ef791b1d0e68ed4e8fc52af2de81f58157bfd5f 100755 (executable)
--- 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