Unity Control Center

Merge lp:~laney/unity-control-center/lp1630156-16.04 into lp:unity-control-center/16.04

  1. lp1630156-16.04
  2. Merge into 16.04
Proposed by Iain Lane
Status: Merged
Approved by: Iain Lane
Approved revision: 12864
Merged at revision: 12865
Proposed branch: lp:~laney/unity-control-center/lp1630156-16.04
Merge into: lp:unity-control-center/16.04
Diff against target: 17 lines (+2/-2)
1 file modified
panels/user-accounts/um-password-dialog.c (+2/-2)
To merge this branch: bzr merge lp:~laney/unity-control-center/lp1630156-16.04
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+316940@code.launchpad.net

Commit message

user-accounts: Reset the AccountsService password mode when setting the password. There's a codepath for directly setting the password when the user is setting their own, but this doesn't set the AS mode back to ACT_USER_PASSWORD_MODE_REGULAR. If you don't change this and you're in ACT_USER_PASSWORD_MODE_NONE, then you end up staying in the nopasswdlogin group.

Description of the change

user-accounts: Reset the AccountsService password mode when setting the password

There's a codepath for directly setting the password when the user is setting their own, but this doesn't set the AS mode back to ACT_USER_PASSWORD_MODE_REGULAR. If you don't change this and you're in ACT_USER_PASSWORD_MODE_NONE, then you end up staying in the nopasswdlogin group.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Same change as trunk, LGTM!

review: Approve

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 2016-03-09 22:01:38 +0000
3+++ panels/user-accounts/um-password-dialog.c 2017-02-10 10:27:24 +0000
4@@ -249,11 +249,11 @@
5 gdk_window_set_cursor (gtk_widget_get_window (um->dialog), cursor);
6 gdk_display_flush (display);
7 g_object_unref (cursor);
8- return;
9+ } else {
10+ act_user_set_password (um->user, password, hint);
11 }
12
13 act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_REGULAR);
14- act_user_set_password (um->user, password, hint);
15 break;
16
17 case UM_PASSWORD_DIALOG_MODE_SET_AT_LOGIN:

Subscribers

People subscribed via source and target branches