Merge lp:~azzar1/unity/lp-1320438 into lp:unity

[Andrea Azzarone]

Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen

== Problem ==
Unity launcher auto hide fails on screen unlock using "Super+L"

== Fix ==
Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3807
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~andyrock/unity/lp-1320438/+merge/220950/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/931/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/18

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

review: Needs Fixing (continuous-integration)

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

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-05-12 22:01:39 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-05-26 12:24:27 +0000
@@ -3826,8 +3826,12 @@
     screen->removeAction(&action);
 
   // We notify that super/alt have been released, to avoid to leave unity in inconsistent state
-  showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, getOptions());
-  showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, getOptions());
+  CompOption::Vector options(8);
+  options[7].setName("time", CompOption::TypeInt);
+  options[7].value().set((int) screen->getCurrentTime());
+
+  showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options);
+  showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options);
 }
 
 void UnityScreen::OnScreenUnlocked()