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

Proposed by Peter de Ridder
Status: Rejected
Rejected by: Robert Ancell
Proposed branch: lp:~cavalier/lightdm/stop-after-unlock
Merge into: lp:lightdm
Diff against target: 25 lines (+6/-0)
1 file modified
src/display.c (+6/-0)
To merge this branch: bzr merge lp:~cavalier/lightdm/stop-after-unlock
Reviewer Review Type Date Requested Status
Robert Ancell Disapprove
Review via email: mp+155338@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

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?

Revision history for this message
Robert Ancell (robert-ancell) wrote :

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

Stop greeter after unlock

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
378 if (greeter_get_guest_authenticated (greeter))378 if (greeter_get_guest_authenticated (greeter))
379 {379 {
380 if (switch_to_guest (display))380 if (switch_to_guest (display))
381 {
382 display_stop (display);
381 return TRUE;383 return TRUE;
384 }
382385
383 /* Set to login as guest */386 /* Set to login as guest */
384 display_set_autologin_user (display, NULL, TRUE, 0);387 display_set_autologin_user (display, NULL, TRUE, 0);
@@ -386,7 +389,10 @@
386 else389 else
387 {390 {
388 if (switch_to_user (display, session_get_user (greeter_get_authentication_session (display->priv->greeter))))391 if (switch_to_user (display, session_get_user (greeter_get_authentication_session (display->priv->greeter))))
392 {
393 display_stop (display);
389 return TRUE;394 return TRUE;
395 }
390 }396 }
391397
392 /* Stop the greeter, the session will start when the greeter has quit */398 /* Stop the greeter, the session will start when the greeter has quit */

Subscribers

People subscribed via source and target branches