Merge lp:~azzar1/unity/fix-1308572 into lp:unity

[Andrea Azzarone]

Do not allow to activate twice the same entry!

Do not allow to activate twice the same entry. Damn you nux!!

[Brandon Schaefer (brandontschaefer)]

Nice, fixes crash for me!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3787
http://jenkins.qa.ubuntu.com/job/unity-ci/882/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/414/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/416/console

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

review: Needs Fixing (continuous-integration)

[Robert Ancell (robert-ancell)]

Confirmed fixed here doing a full package build from this branch.
unity 7.2.0+14.04.20140414.1-0ubuntu1 crashes in approximately 10s by holding down enter in the lock screen. After crash session is unlocked.

Tested this branch for over a minute with no crashes occuring.

review: Approve

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-04-01 19:05:07 +0000
+++ lockscreen/UserPromptView.cpp	2014-04-16 21:34:37 +0000
@@ -348,6 +348,11 @@
     nux::GetWindowCompositor().SetKeyFocusArea(text_entry);
 
   text_entry->activated.connect([this, text_input, promise](){
+    auto* text_entry = text_input->text_entry();
+
+    if (!text_entry->GetInputEventSensitivity())
+      return;
+
     if (focus_queue_.size() == 1)
     {
       text_input->SetSpinnerVisible(true);
@@ -355,7 +360,6 @@
     }
 
     focus_queue_.pop_front();
-    auto* text_entry = text_input->text_entry();
     cached_focused_geo_ = text_entry->GetGeometry();
     text_entry->SetInputEventSensitivity(false);
     QueueRelayout();