Merge lp:~townsend/unity/fix-broken-decors-regression into lp:unity

[Christopher Townsend]

The ShowDesktopHandleWindowInterface teardown was missing it's call to DeleteHandler() in a recent commit that refactored the handling of some Show Desktop code.

= Issue =
Revno. 3515 caused a regression when leaving Show Desktop caused all window decorations to become unusuable.

= Fix =
The ShowDesktopHandleWindowInterface teardown was missing it's call to DeleteHandler().

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3529
http://jenkins.qa.ubuntu.com/job/unity-ci/383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/272
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/270/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/271

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

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Right, sorry for the regression I caused :/

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-09-20 18:25:21 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-09-23 21:17:28 +0000
@@ -1344,18 +1344,19 @@
 
     if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
     {
+      wi->DeleteHandler();
       it = ShowdesktopHandler::animating_windows.erase(it);
       continue;
     }
     else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
     {
-      wi->AddDamage ();
+      wi->AddDamage();
     }
 
     ++it;
   }
 
-  cScreen->donePaint ();
+  cScreen->donePaint();
 }
 
 void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)