Merge lp:~jassmith/unity/unity.fix-monitor-tracking into lp:unity

Proposed by Jason Smith on 2012-02-22
Status: Merged
Approved by: Jason Smith on 2012-02-22
Approved revision: 2004
Merged at revision: 2004
Proposed branch: lp:~jassmith/unity/unity.fix-monitor-tracking
Merge into: lp:unity
Diff against target: 11 lines (+1/-1)
1 file modified
plugins/unityshell/src/BamfLauncherIcon.cpp (+1/-1)
To merge this branch: bzr merge lp:~jassmith/unity/unity.fix-monitor-tracking
Reviewer Review Type Date Requested Status
Tim Penhey (community) 2012-02-22 Approve on 2012-02-22
Review via email:

Description of the change

Restores accidentally commented code. This should have been uncommented before merge previously, but was missed. Fixes bug where launcher didn't properly reflect window states on initial startup

To post a comment you must log in.
Tim Penhey (thumper) wrote :

<thumper> jason: ok... I'm going to ask the question you love to hate
<jason> no there is no bug
<thumper> jason: what is the behaviour before the commit, and how do I know it is fixed?
<jason> oh that question
<jason> before:
<jason> sometimes when you started an application unity would think it was on monitor 0 instead of monitor 1 because of a race condition
<jason> after:
<jason> we check, thus eliminating the race condition
<thumper> and to reproduce the behaviour?
<thomi> possible switcher bug that should be easy to fix:
<jason> thumper, restart unity enough times to eventually trigger the race condition

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/BamfLauncherIcon.cpp'
2--- plugins/unityshell/src/BamfLauncherIcon.cpp 2012-02-21 04:32:46 +0000
3+++ plugins/unityshell/src/BamfLauncherIcon.cpp 2012-02-22 02:31:18 +0000
4@@ -123,7 +123,7 @@
5 WindowManager::Default()->compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
6 WindowManager::Default()->terminate_expo.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
8- //EnsureWindowState();
9+ EnsureWindowState();
10 UpdateMenus();
11 UpdateDesktopFile();