Unity

Merge lp:~gordallott/unity/fix-overlay-race-condition into lp:unity

  1. fix-overlay-race-condition
  2. Merge into trunk
Proposed by Gord Allott
Status: Rejected
Rejected by: Brandon Schaefer
Proposed branch: lp:~gordallott/unity/fix-overlay-race-condition
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
dash/DashController.cpp (+1/-1)
To merge this branch: bzr merge lp:~gordallott/unity/fix-overlay-race-condition
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+123906@code.launchpad.net

Commit message

Fixes a slight race issue with the dash not sending a UBUS signal because the idle queue is starved

Description of the change

Fixes a slight race issue with the dash not sending a UBUS signal because the idle queue is starved
No tests, trivial change

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

Is this branch still required, the original code is now changed: http://bazaar.launchpad.net/~unity-team/unity/trunk/revision/2684#dash/DashController.cpp

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

The code there is no longer used. It has been reverted back to not using Idle....

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/DashController.cpp'
2--- dash/DashController.cpp 2012-09-11 12:01:20 +0000
3+++ dash/DashController.cpp 2012-09-12 09:10:36 +0000
4@@ -289,7 +289,7 @@
5
6 // The launcher must receive UBUS_OVERLAY_SHOW before window_->EnableInputWindow().
7 // Other wise the Launcher gets focus for X, which causes XIM to fail.
8- sources_.AddIdle([this] {
9+ sources_.AddTimeout(0, [this] {
10 GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
11 ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
12 return false;