Unity

Merge lp:~townsend/unity/fix-first-run-hints-close into lp:unity

  1. fix-first-run-hints-close
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3932
Proposed branch: lp:~townsend/unity/fix-first-run-hints-close
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~townsend/unity/fix-first-run-hints-close
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+251979@code.launchpad.net

Commit message

Use a 2 second delay before showing the first run shortcut hints to workaround a race condition on input handling.

Description of the change

This is a temporary quick fix until the proper input::Monitor handling is in place for the proper solution.

I will create a new bug to track fixing this properly.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/unity-ci/1162/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/49

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK, can be reverted later

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2015-02-27 15:38:11 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2015-03-05 16:40:23 +0000
4@@ -4031,7 +4031,7 @@
5
6 void UnityScreen::ShowFirstRunHints()
7 {
8- sources_.AddTimeoutSeconds(1, [this] {
9+ sources_.AddTimeoutSeconds(2, [this] {
10 auto const& config_dir = DesktopUtilities::GetUserConfigDirectory();
11 if (!config_dir.empty() && !g_file_test((config_dir+local::FIRST_RUN_STAMP).c_str(), G_FILE_TEST_EXISTS))
12 {