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

[Jason Smith]

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

[Tim Penhey (thumper)]

<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: https://bugs.launchpad.net/unity/+bug/938353
<jason> thumper, restart unity enough times to eventually trigger the race condition

review: Approve

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-02-21 04:32:46 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-02-22 02:31:18 +0000
@@ -123,7 +123,7 @@
   WindowManager::Default()->compiz_screen_viewport_switch_ended.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
   WindowManager::Default()->terminate_expo.connect(sigc::mem_fun(this, &BamfLauncherIcon::EnsureWindowState));
 
-  //EnsureWindowState();
+  EnsureWindowState();
   UpdateMenus();
   UpdateDesktopFile();