Merge lp:~townsend/unity/fix-lp1291362 into lp:unity

[Christopher Townsend]

When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.

When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.

To test:
* Have a multi-monitor setup.
* Do not have the Launcher on the left most monitor.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3786
http://jenkins.qa.ubuntu.com/job/unity-ci/891/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/425

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2014-04-02 14:36:55 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2014-04-21 15:10:36 +0000
@@ -383,10 +383,10 @@
 
   if (!IsRunning() || (IsRunning() && !user_visible)) // #1 above
   {
-    if (GetQuirk(Quirk::STARTING))
+    if (GetQuirk(Quirk::STARTING, arg.monitor))
       return;
 
-    SetQuirk(Quirk::STARTING, true);
+    SetQuirk(Quirk::STARTING, true, arg.monitor);
     OpenInstanceLauncherIcon(arg.timestamp);
   }
   else // app is running