Unity

Merge lp:~azzar1/unity/lockscreen-dont-allow-multiple-failre-retry into lp:unity

  1. lockscreen-dont-allow-multiple-failre-retry
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4262
Proposed branch: lp:~azzar1/unity/lockscreen-dont-allow-multiple-failre-retry
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
1 file modified
lockscreen/UserPromptView.cpp (+2/-2)
To merge this branch: bzr merge lp:~azzar1/unity/lockscreen-dont-allow-multiple-failre-retry
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+331832@code.launchpad.net

Commit message

Avoid to show multiple "Authentication Failure" messages.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/UserPromptView.cpp'
2--- lockscreen/UserPromptView.cpp 2017-09-15 13:36:44 +0000
3+++ lockscreen/UserPromptView.cpp 2017-10-05 03:56:31 +0000
4@@ -488,6 +488,7 @@
5 void UserPromptView::DoUnlock()
6 {
7 session_manager_->unlock_requested.emit();
8+ num_retry_auth_ = 0;
9 }
10
11 void UserPromptView::HandleAuthenticationStartFailure()
12@@ -504,12 +505,11 @@
13 }
14 else
15 {
16- num_retry_auth_ = 0;
17-
18 AddMessage(_("Authentication failure"), nux::color::Red);
19 AddButton(_("Switch to greeter…"), [this] {
20 session_manager_->SwitchToGreeter();
21 });
22+
23 GetLayout()->AddLayout(button_layout_);
24 }
25 }