Unity Control Center

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

  1. fix-user-password-dialog
  2. Merge into 14.04
Proposed by Sebastien Bacher
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 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
=== modified file 'panels/user-accounts/um-password-dialog.c'
--- panels/user-accounts/um-password-dialog.c 2014-03-19 14:43:12 +0000
+++ panels/user-accounts/um-password-dialog.c 2014-06-04 15:35:30 +0000
@@ -268,6 +268,10 @@
268 case UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT:268 case UM_PASSWORD_DIALOG_MODE_LOCK_ACCOUNT:
269 act_user_set_locked (um->user, TRUE);269 act_user_set_locked (um->user, TRUE);
270 act_user_set_automatic_login (um->user, FALSE);270 act_user_set_automatic_login (um->user, FALSE);
271
272 /*Set the password mode to regular in case the user is currently in the nopasswdlogin group.
273 Otherwise, the user will still be able to login even though the account is disabled. */
274 act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_REGULAR);
271 break;275 break;
272276
273 case UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT:277 case UM_PASSWORD_DIALOG_MODE_UNLOCK_ACCOUNT:

Subscribers

People subscribed via source and target branches