← Back to branch summary

~robert-ancell/lightdm/enable-tests

« back to all changes in this revision

Viewing changes to src/session.c

  • Committer: Tarmac
  • Author(s): Robert Ancell
  • Date: 2013-08-08 22:23:33 UTC
  • mfrom: (1749.1.3 seat-lock)
  • Revision ID: tarmac-20130808222333-3nao2tjwmdj6dkh0
Fix session locking broken in 1.7.5. Fixes: https://bugs.launchpad.net/bugs/1209107.

Approved by Robert Ancell, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/session.c
780
780
    g_return_if_fail (session != NULL);
781
781
    if (getuid () == 0)
782
782
    {
783
 
        if (login1_is_running ())
 
783
        if (session->priv->login1_session)
784
784
            login1_lock_session (session->priv->login1_session);
785
 
        if (!session->priv->login1_session)
 
785
        else if (session->priv->console_kit_cookie)
786
786
            ck_lock_session (session->priv->console_kit_cookie);
787
787
    }
788
788
}
793
793
    g_return_if_fail (session != NULL);
794
794
    if (getuid () == 0)
795
795
    {
796
 
        if (login1_is_running ())
 
796
        if (session->priv->login1_session)
797
797
            login1_unlock_session (session->priv->login1_session);
798
 
        if (!session->priv->login1_session)
 
798
        else if (session->priv->console_kit_cookie)
799
799
            ck_unlock_session (session->priv->console_kit_cookie);
800
800
    }
801
801
}