Merge lp:~nick-dedekind/unity/lp1045298.dash-hide-preview-close into lp:unity

[Nick Dedekind]

Close preview when dash is hidden. (LP#1045298)

Close preview when dash is hidden. (LP#1045298)
This causes a preview close to be emitted to the lens (stops music preview daemon).

[Gord Allott (gordallott)]

+1

review: Approve

[Omer Akram (om26er)]

I have written an autopilot test case for this one, so I guess this one can be allowed to go into trunk and i'll propose the AP test with my other branch.

[Omer Akram (om26er)]

looks fine to me.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1211/console reported an error when processing this lp:~nick-dedekind/unity/lp1045298.dash-hide-preview-close branch.
Not merging it.

[Nick Dedekind (nick-dedekind)]

bumping after failed merge.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1213/console reported an error when processing this lp:~nick-dedekind/unity/lp1045298.dash-hide-preview-close branch.
Not merging it.

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-08-22 13:14:18 +0000
+++ dash/DashView.cpp	2012-09-05 09:25:29 +0000
@@ -247,6 +247,12 @@
   home_lens_->view_type = ViewType::HIDDEN;
   LOG_DEBUG(logger) << "Setting ViewType " << ViewType::HIDDEN
                             << " on '" << home_lens_->id() << "'";
+
+  // if a preview is open, close it
+  if (preview_displaying_) 
+  {
+    ClosePreview();
+  }
 }
 
 void DashView::SetupViews()