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

Proposed by Iain Lane on 2017-02-10
Status: Merged
Approved by: Iain Lane on 2017-02-13
Approved revision: 12879
Merged at revision: 12879
Proposed branch: lp:~laney/unity-control-center/lp1630156-16.10
Merge into: lp:unity-control-center/16.10
Diff against target: 30 lines (+3/-3)
2 files modified
debian/control (+1/-1)
panels/user-accounts/um-password-dialog.c (+2/-2)
To merge this branch: bzr merge lp:~laney/unity-control-center/lp1630156-16.10
Reviewer Review Type Date Requested Status
Robert Ancell 2017-02-10 Approve on 2017-02-13
Review via email: mp+316941@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.
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 'debian/control'
2--- debian/control 2016-10-03 11:14:01 +0000
3+++ debian/control 2017-02-10 10:27:36 +0000
4@@ -58,7 +58,7 @@
5 libgl1-mesa-dev,
6 valac (>= 0.20.0),
7 indicator-datetime
8-Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk
9+Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.10
10
11 Package: unity-control-center
12 Architecture: any
13
14=== modified file 'panels/user-accounts/um-password-dialog.c'
15--- panels/user-accounts/um-password-dialog.c 2016-03-09 22:01:38 +0000
16+++ panels/user-accounts/um-password-dialog.c 2017-02-10 10:27:36 +0000
17@@ -249,11 +249,11 @@
18 gdk_window_set_cursor (gtk_widget_get_window (um->dialog), cursor);
19 gdk_display_flush (display);
20 g_object_unref (cursor);
21- return;
22+ } else {
23+ act_user_set_password (um->user, password, hint);
24 }
25
26 act_user_set_password_mode (um->user, ACT_USER_PASSWORD_MODE_REGULAR);
27- act_user_set_password (um->user, password, hint);
28 break;
29
30 case UM_PASSWORD_DIALOG_MODE_SET_AT_LOGIN:

Subscribers

People subscribed via source and target branches