Add back the greeter hide users hint

diff --git a/src/seat.c b/src/seat.c
index 297ef0a9344f7708041de2b8f5ee92133a25a90d..94413a90185e7ff8d1a95c6bfe42203e779b1ad8 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -973,6 +973,7 @@ create_greeter_session (Seat *seat)
     /* Set hints to greeter */
     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");
 
     return greeter_session;
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6367d181309ac32071650865e22a88aa769a338a..63ed891d88fed25647fb07564f96abac45a1bdb6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ TESTS = \
        test-greeter-xserver-crash \
        test-greeter-wrapper \
        test-greeter-default-session \
+       test-greeter-hide-users \
        test-no-config \
        test-additional-config \
        test-headless \
@@ -289,6 +290,7 @@ EXTRA_DIST = \
        scripts/expired.conf \
        scripts/greeter-default-session.conf \
        scripts/greeter-fail-start.conf \
+       scripts/greeter-hide-users.conf \
        scripts/greeter-not-installed.conf \
        scripts/greeter-wrapper.conf \
        scripts/greeter-xserver-crash.conf \

diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf
new file mode 100644 (file)
index 0000000..864f32b
--- /dev/null
+++ b/tests/scripts/greeter-hide-users.conf
@@ -0,0 +1,32 @@
+#
+# Check greeter is informed if user list should be hidden
+#
+
+[SeatDefaults]
+greeter-hide-users=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 hide users
+#?GREETER-X-0 HIDE-USERS-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 998e6b20f52a1e0a8d3501994da167dedccd6ca4..8cb506cf5483ce1869bd15a0e40238533e2dd011 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -368,6 +368,8 @@ main (int argc, char **argv)
         status_notify ("%s SELECT-GUEST-HINT", greeter_id);
     if (lightdm_greeter_get_lock_hint (greeter))
         status_notify ("%s LOCK-HINT", greeter_id);
+    if (lightdm_greeter_get_hide_users_hint (greeter))
+        status_notify ("%s HIDE-USERS-HINT", greeter_id);
 
     g_main_loop_run (loop);
 

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