diff options
| author | Laércio de Sousa <lbsousajr@gmail.com> | 2015-05-11 15:43:59 -0300 |
|---|---|---|
| committer | Laércio de Sousa <lbsousajr@gmail.com> | 2015-05-11 15:43:59 -0300 |
| commit | bb562ff7464883d723b5955604a69c6731ecf3d8 (patch) | |
| tree | 88483059a0602fef74bab8af6b4da5f767e1c9fe | |
| parent | af2bb119e2deaff3ee902e411f42bc42bb9d62cd (diff) | |
| download | lightdm-gtk-greeter-git-bb562ff7464883d723b5955604a69c6731ecf3d8.tar.gz | |
Avoid triggering autologin if user locks screen with light-locker.
| -rw-r--r-- | src/lightdm-gtk-greeter.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 1e34f86..0c56130 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -2307,24 +2307,28 @@ show_message_cb (LightDMGreeter *greeter, const gchar *text, LightDMMessageType static void timed_autologin_cb (LightDMGreeter *greeter) { - if (lightdm_greeter_get_is_authenticated (greeter)) + /* Don't trigger autologin if user locks screen with light-locker (thanks to Andrew P.). */ + if (!lightdm_greeter_get_lock_hint ()) { - /* 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)) + if (lightdm_greeter_get_is_authenticated (greeter)) { - /* "Guest session" is selected, but autologin-user is configured. */ - start_authentication (lightdm_greeter_get_autologin_user_hint (greeter)); - prompted = TRUE; + /* 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); } - else - lightdm_greeter_authenticate_autologin (greeter); } static void |