Merge lp:~townsend/unity/fix-lp1308265-trusty into lp:unity/7.2

[Christopher Townsend]

Forward first key event that happens on top of the blank window to the lockscreen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/3

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

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3821
http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/13

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

review: Approve (continuous-integration)

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-12-16 19:27:36 +0000
+++ lockscreen/LockScreenController.cpp	2015-05-15 19:56:12 +0000
@@ -322,7 +322,9 @@
     blank_window_->mouse_move.connect([this](int, int, int dx, int dy, unsigned long, unsigned long) {
       if ((dx || dy) && !lockscreen_timeout_) HideBlankWindow();
     });
-    blank_window_->key_down.connect([this] (unsigned long, unsigned long e, unsigned long, const char*, unsigned short) {
+    blank_window_->key_down.connect([this] (unsigned long et, unsigned long k, unsigned long s, const char* c, unsigned short kc) {
+      if (prompt_view_.GetPointer() && prompt_view_->focus_view())
+        prompt_view_->focus_view()->key_down.emit(et, k, s, c, kc);
       if (!lockscreen_timeout_) HideBlankWindow();
     });
     blank_window_->mouse_down.connect([this] (int, int, unsigned long, unsigned long) {