Merge lp:~azzar1/unity/lp-1233666 into lp:unity

[Andrea Azzarone]

Update icon_under_mouse before process mouse movemnt in the tooltip manager.

== Problem ==
Bug #1233666: AP failure: test_launcher_tooltip_disabling

== Fix ==
Update icon_under_mouse before process mouse movement in the tooltip manager.

== Test ==
There is/was already a failing AP test.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3547
http://jenkins.qa.ubuntu.com/job/unity-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/299

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

review: Approve (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-09-19 13:00:42 +0000
+++ launcher/Launcher.cpp	2013-10-01 18:46:13 +0000
@@ -2226,13 +2226,14 @@
 void Launcher::RecvMouseMove(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
 {
   SetMousePosition(x, y);
-  tooltip_manager_.MouseMoved(icon_under_mouse_);
 
   if (!hidden_)
     UpdateChangeInMousePosition(dx, dy);
 
   // Every time the mouse moves, we check if it is inside an icon...
   EventLogic();
+
+  tooltip_manager_.MouseMoved(icon_under_mouse_);
 }
 
 void Launcher::RecvMouseWheel(int /*x*/, int /*y*/, int wheel_delta, unsigned long /*button_flags*/, unsigned long key_flags)