Merge lp:~cavalier/lightdm/stop-after-unlock into lp:lightdm

[Peter de Ridder]

[Robert Ancell (robert-ancell)]

As per the bug, I'm unable to reproduce the problem this is solving. I've added additional regression tests that should show the bug as I understand it but they don't show a problem. If you can reproduce, can you add a regression test showing how this bug is triggered?

[Robert Ancell (robert-ancell)]

Hi Peter,

As discussed in bug 1005813 the cause of this problem turned out to be something else. It should be fixed in revision 1623 [1].

Note that the proposed change was not correct because it could have destroyed the display before the switch had occurred. LightDM destroys greeters once a switch occurs to avoid this problem.

Thanks for taking the time to make the patch and diagnose the problem!

[1] http://bazaar.launchpad.net/~lightdm-team/lightdm/trunk/revision/1623

review: Disapprove

Unmerged revisions

1619. By Peter de Ridder on 2013-03-25

Stop greeter after unlock

=== modified file 'src/display.c'
--- src/display.c	2013-03-07 21:40:31 +0000
+++ src/display.c	2013-03-25 20:10:25 +0000
@@ -378,7 +378,10 @@
     if (greeter_get_guest_authenticated (greeter))
     {
         if (switch_to_guest (display))
+        {
+            display_stop (display);
             return TRUE;
+        }
 
         /* Set to login as guest */
         display_set_autologin_user (display, NULL, TRUE, 0);
@@ -386,7 +389,10 @@
     else
     {
         if (switch_to_user (display, session_get_user (greeter_get_authentication_session (display->priv->greeter))))
+        {
+            display_stop (display);
             return TRUE;
+        }
     }
 
     /* Stop the greeter, the session will start when the greeter has quit */