Don't set user hints for automatic background logins, make test check that guest...

diff --git a/src/seat.c b/src/seat.c
index 0190fbb856d5eb2cb594ce244014a971befb998b..5ac18079c3432f6159b656f5b0635f70adc28caa 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -708,7 +708,6 @@ seat_real_start (Seat *seat)
         g_signal_connect (display, "ready", G_CALLBACK (autologin_greeter_ready_cb), seat);
         if (autologin_timeout > 0)
             display_set_autologin_user (display, autologin_username, autologin_guest, autologin_timeout);
-        display_set_select_user_hint (display, autologin_username, autologin_guest, FALSE);
         return start_display (seat, display);
     }
 

diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index ab4acaefe9b306898e155bf6b54bd724779476cc..9ec4f359475b1b096bc9a2a382eaf4ddffce2ced 100644 (file)
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -17,7 +17,6 @@ autologin-in-background=true
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
-#?GREETER-X-0 SELECT-USER-HINT USERNAME=have-password1    
 
 # Autologin session starts
 #?XSERVER-1 START

diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 40c34851e6853d137fd5662ca9844864a30beac2..356c5623704e49fc602ea3ed5ba064edb9d9aa85 100644 (file)
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -18,7 +18,6 @@ autologin-in-background=true
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
-#?GREETER-X-0 SELECT-USER-HINT USERNAME=have-password1   
 
 # Autologin session starts
 #?XSERVER-1 START

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index bfcbf89d233f0ca4ddbffa16390002951a5c4ba1..f95282bb81098ac705f346123dbd2506359f87e0 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -301,6 +301,8 @@ main (int argc, char **argv)
 
     if (lightdm_greeter_get_select_user_hint (greeter))
         status_notify ("%s SELECT-USER-HINT USERNAME=%s", greeter_id, lightdm_greeter_get_select_user_hint (greeter));
+    if (lightdm_greeter_get_select_guest_hint (greeter))
+        status_notify ("%s SELECT-GUEST-HINT", greeter_id);
     if (lightdm_greeter_get_lock_hint (greeter))
         status_notify ("%s LOCK-HINT", greeter_id);