Merge lp:~brandontschaefer/unity/lp.1292647-fixes into lp:unity

[Brandon Schaefer]

When we see an escape in lockscreen prompt, clear the password.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3741
http://jenkins.qa.ubuntu.com/job/unity-ci/833/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/367

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/833/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3742
http://jenkins.qa.ubuntu.com/job/unity-ci/834/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/368

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/834/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

auto& focused_entry = focus_queue_.front();

Since it's seems defined on stl_deque.h as just:
 front() const { return *begin(); }

It might cause crashes (unlikely here, but still)... So I think it's just better if you instead do:

if (!focus_queue_.empty())
  focus_queue_.front()->SetText("");

[Andrea Azzarone (azzar1)]

Marco's comment makes sense. Calling ::front on an empty container should be undefined behavior.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3743
http://jenkins.qa.ubuntu.com/job/unity-ci/835/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/369

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/835/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-03-06 21:37:45 +0000
+++ lockscreen/UserPromptView.cpp	2014-03-26 18:53:46 +0000
@@ -125,6 +125,19 @@
                                         sigc::mem_fun(this, &UserPromptView::AuthenticationCb));
 }
 
+bool UserPromptView::InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character)
+{
+  if ((eventType == nux::NUX_KEYDOWN) && (key_sym == NUX_VK_ESCAPE))
+  {
+    if (!focus_queue_.empty())
+      focus_queue_.front()->SetText("");
+
+    return true;
+  }
+
+  return false;
+}
+
 void UserPromptView::ResetLayout()
 {
   focus_queue_.clear();

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-03-05 04:09:13 +0000
+++ lockscreen/UserPromptView.h	2014-03-26 18:53:46 +0000
@@ -64,6 +64,8 @@
 private:
   void ResetLayout();
 
+  bool InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character);
+
   session::Manager::Ptr session_manager_;
   UserAuthenticatorPam user_authenticator_;
   std::shared_ptr<nux::AbstractPaintLayer> bg_layer_;