Merge lp:~brandontschaefer/unity/fix-failing-swticher-click-ap-test into lp:unity

[Brandon Schaefer]

Fixes:
unity.tests.test_switcher.SwitcherDetailsMouseTests.test_mouse_click_will_activate_detail_icon(show_desktop_icon_true)
unity.tests.test_switcher.SwitcherDetailsMouseTests.test_mouse_click_will_activate_detail_icon(show_desktop_icon_false)

Only handle the event if we really use it...otherwise we skip events we don't actually use.

Fixes:
unity.tests.test_switcher.SwitcherDetailsMouseTests.test_mouse_click_will_activate_detail_icon(show_desktop_icon_true) 20.767 1
unity.tests.test_switcher.SwitcherDetailsMouseTests.test_mouse_click_will_activate_detail_icon(show_desktop_icon_false)

For now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3478
http://jenkins.qa.ubuntu.com/job/unity-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/209

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3479
http://jenkins.qa.ubuntu.com/job/unity-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/210

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

LGTM +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/240/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1873
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/196/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/196

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Seems to be some transient unit test failures for amd64. Re-approving...

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-08-12 02:54:48 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-08-27 21:44:20 +0000
@@ -1207,9 +1207,8 @@
           if (close_button_geo_.IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
           {
             window->close(0);
+            handled = true;
           }
-
-          handled = true;
         }
 
         if (middle_clicked_)
@@ -1219,10 +1218,10 @@
               GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root)))
           {
             window->close(0);
+            handled = true;
           }
 
           middle_clicked_ = false;
-          handled = true;
         }
       }
       break;