Add back the greeter guest account hint

diff --git a/src/seat.c b/src/seat.c
index f4699f7dd604484484c8786e797c43f8cc6672c9..a1b7505451aa3b3659a1127132d969e50f5b02e6 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -214,13 +214,6 @@ seat_get_allow_guest (Seat *seat)
     return seat_get_boolean_property (seat, "allow-guest") && guest_account_is_installed ();
 }
 
-gboolean
-seat_get_greeter_allow_guest (Seat *seat)
-{
-    g_return_val_if_fail (seat != NULL, FALSE);  
-    return seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest");
-}
-
 static gboolean
 run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, User *user)
 {
@@ -976,6 +969,7 @@ create_greeter_session (Seat *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");
     greeter_set_hint (greeter_session, "show-remote-login", seat_get_boolean_property (seat, "greeter-show-remote-login") ? "true" : "false");
+    greeter_set_hint (greeter_session, "has-guest-account", seat_get_allow_guest (seat) && seat_get_boolean_property (seat, "greeter-allow-guest") ? "true" : "false");
 
     return greeter_session;
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0c5371b9b80da5599d239f9bceb542a058d92d43..ec7383377a9bdf44827cacf55d6fb3b520476302 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-allow-guest \
        test-greeter-hide-users \
        test-greeter-show-manual-login \
        test-greeter-show-remote-login \
@@ -290,6 +291,7 @@ EXTRA_DIST = \
        scripts/dbus.conf \    
        scripts/denied.conf \
        scripts/expired.conf \
+       scripts/greeter-allow-guest.conf \
        scripts/greeter-default-session.conf \
        scripts/greeter-fail-start.conf \
        scripts/greeter-hide-users.conf \

diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf
new file mode 100644 (file)
index 0000000..1bfc477
--- /dev/null
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -0,0 +1,32 @@
+#
+# Check greeter is informed if manual login should be showed (it defaults to show)
+#
+
+[SeatDefaults]
+greeter-allow-guest=false
+
+#?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 allow guest
+#?GREETER-X-0 HAS-GUEST-ACCOUNT-HINT=FALSE
+
+# 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 5e4456c3755b626f795ff64e92e7dab27b2fd59b..36c2b85e7900fef44526e76a687734c7016da860 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_has_guest_account_hint (greeter))
+        status_notify ("%s HAS-GUEST-ACCOUNT-HINT=FALSE", 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))

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