Merge lp:~lbssousa/lightdm-gtk-greeter/2.0-fix-timed-autologin into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/2.0

[Laércio de Sousa]

This patch fixes a timed autologin issue. Currently, when autologin timeout expires, and configured autologin user is already selected in user list, lightdm-gtk-greeter's authentication_complete_cb() doesn't start user session unless user clicks on login button.

[lp:~lbssousa/lightdm-gtk-greeter/2.0-fix-timed-autologin]

324. By Laércio de Sousa on 2015-05-13

Avoid triggering autologin if user locks screen with light-locker.

325. By Laércio de Sousa on 2015-05-13

Add missing argument in previous commit.

=== modified file 'src/lightdm-gtk-greeter.c'
--- src/lightdm-gtk-greeter.c	2015-01-26 14:41:10 +0000
+++ src/lightdm-gtk-greeter.c	2015-05-13 13:13:58 +0000
@@ -2305,6 +2305,33 @@
 }
 
 static void
+timed_autologin_cb (LightDMGreeter *greeter)
+{
+    /* Don't trigger autologin if user locks screen with light-locker (thanks to Andrew P.). */
+    if (!lightdm_greeter_get_lock_hint (greeter))
+    {
+        if (lightdm_greeter_get_is_authenticated (greeter))
+        {   
+            /* Configured autologin user may be already selected in user list. */
+            if (lightdm_greeter_get_authentication_user (greeter))
+                /* Selected user matches configured autologin-user option. */
+                start_session ();
+            else if (lightdm_greeter_get_autologin_guest_hint (greeter))
+                /* "Guest session" is selected and autologin-guest is enabled. */
+                start_session ();
+            else if (lightdm_greeter_get_autologin_user_hint (greeter))
+            {
+                /* "Guest session" is selected, but autologin-user is configured. */
+                start_authentication (lightdm_greeter_get_autologin_user_hint (greeter));
+                prompted = TRUE;
+            }
+        }
+        else
+            lightdm_greeter_authenticate_autologin (greeter);
+    }
+}
+
+static void
 authentication_complete_cb (LightDMGreeter *greeter)
 {
     prompt_active = FALSE;
@@ -2678,7 +2705,7 @@
     g_signal_connect (greeter, "show-prompt", G_CALLBACK (show_prompt_cb), NULL);
     g_signal_connect (greeter, "show-message", G_CALLBACK (show_message_cb), NULL);
     g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
-    g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (lightdm_greeter_authenticate_autologin), NULL);
+    g_signal_connect (greeter, "autologin-timer-expired", G_CALLBACK (timed_autologin_cb), NULL);
     if (!lightdm_greeter_connect_sync (greeter, NULL))
         return EXIT_FAILURE;