Add back the greeter show manual login hint

diff --git a/src/seat.c b/src/seat.c
index 94413a90185e7ff8d1a95c6bfe42203e779b1ad8..04be3202c075edf308492e8d5005eaf1a9237370 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -974,6 +974,7 @@ create_greeter_session (Seat *seat)
     greeter_set_hint (greeter_session, "default-session", seat_get_string_property (seat, "user-session"));
     greeter_set_allow_guest (greeter_session, seat_get_allow_guest (seat));
     greeter_set_hint (greeter_session, "hide-users", seat_get_boolean_property (seat, "greeter-hide-users") ? "true" : "false");
+    greeter_set_hint (greeter_session, "show-manual-login", seat_get_boolean_property (seat, "greeter-show-manual-login") ? "true" : "false");
 
     return greeter_session;
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 63ed891d88fed25647fb07564f96abac45a1bdb6..ff5c4e64e5bd39e0a1cf6753bd9eb86bd7b22046 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ TESTS = \
        test-greeter-wrapper \
        test-greeter-default-session \
        test-greeter-hide-users \
+       test-greeter-show-manual-login \
        test-no-config \
        test-additional-config \
        test-headless \
@@ -292,6 +293,7 @@ EXTRA_DIST = \
        scripts/greeter-fail-start.conf \
        scripts/greeter-hide-users.conf \
        scripts/greeter-not-installed.conf \
+       scripts/greeter-show-manual-login.conf \
        scripts/greeter-wrapper.conf \
        scripts/greeter-xserver-crash.conf \
        scripts/group-membership.conf \

diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf
new file mode 100644 (file)
index 0000000..8c29ebc
--- /dev/null
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -0,0 +1,32 @@
+#
+# Check greeter is informed if manual login should be showed
+#
+
+[SeatDefaults]
+greeter-show-manual-login=true
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Greeter starts
+#?GREETER-X-0 START
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
+
+# Check has correct hint to show manual login
+#?GREETER-X-0 SHOW-MANUAL-LOGIN-HINT
+
+# Cleanup
+#?*STOP-DAEMON
+#?GREETER-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 8cb506cf5483ce1869bd15a0e40238533e2dd011..d1b288190686117efdeacf8b4e1cd6b6f23a408c 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -370,6 +370,8 @@ main (int argc, char **argv)
         status_notify ("%s LOCK-HINT", greeter_id);
     if (lightdm_greeter_get_hide_users_hint (greeter))
         status_notify ("%s HIDE-USERS-HINT", greeter_id);
+    if (lightdm_greeter_get_show_manual_login_hint (greeter))
+        status_notify ("%s SHOW-MANUAL-LOGIN-HINT", greeter_id);
 
     g_main_loop_run (loop);
 

diff --git a/tests/test-greeter-show-manual-login b/tests/test-greeter-show-manual-login
new file mode 100755 (executable)
index 0000000..ba88c27
--- /dev/null
+++ b/tests/test-greeter-show-manual-login
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner greeter-show-manual-login test-gobject-greeter