Merge lp:~echaskes/unity-control-center/fix-user-password-dialog into lp:unity-control-center/14.04

Proposed by Sebastien Bacher on 2014-06-04
Status: Merged
Merged at revision: 12777
Proposed branch: lp:~echaskes/unity-control-center/fix-user-password-dialog
Merge into: lp:unity-control-center/14.04
Diff against target: 14 lines (+4/-0)
1 file modified
panels/user-accounts/um-password-dialog.c (+4/-0)
To merge this branch: bzr merge lp:~echaskes/unity-control-center/fix-user-password-dialog
Reviewer Review Type Date Requested Status
Unity Control Center development team 2014-06-04 Pending
Review via email: mp+222060@code.launchpad.net

Commit message

Updated um-password-dialog.c to removed users to change password mode to regular when locking the account

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/user-accounts/um-password-dialog.c'
2--- panels/user-accounts/um-password-dialog.c 2014-03-19 14:43:12 +0000
3+++ panels/user-accounts/um-password-dialog.c 2014-06-04 15:35:30 +0000
4@@ -268,6 +268,10 @@
5 case UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT:
6 act_user_set_locked (um->user, TRUE);
7 act_user_set_automatic_login (um->user, FALSE);
8+
9+ /*Set the password mode to regular in case the user is currently in the nopasswdlogin group.
10+ Otherwise, the user will still be able to login even though the account is disabled. */
11+ act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_REGULAR);
12 break;
13
14 case UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT:

Subscribers

People subscribed via source and target branches