Merge lp:unity trunk.

(bzr r3587.3.3)

3 files changed, 3 insertions, 4 deletions

diff --git a/unity-shared/BackgroundEffectHelper.cpp b/unity-shared/BackgroundEffectHelper.cpp
index d48aad978..0d86d3aba 100644
--- a/unity-shared/BackgroundEffectHelper.cpp
+++ b/unity-shared/BackgroundEffectHelper.cpp
@@ -74,7 +74,7 @@ void BackgroundEffectHelper::ProcessDamage(nux::Geometry const& geo)
 if (bg_effect_helper->cache_dirty || !bg_effect_helper->owner || !bg_effect_helper->enabled)
 continue;
 
- if (!geo.Intersect(bg_effect_helper->blur_geometry_).IsNull())
+ if (geo.IsIntersecting(bg_effect_helper->blur_geometry_))
 {
 bg_effect_helper->DirtyCache();
 }
diff --git a/unity-shared/PlacesOverlayVScrollBar.cpp b/unity-shared/PlacesOverlayVScrollBar.cpp
index fc5d2daac..e16f4b848 100644
--- a/unity-shared/PlacesOverlayVScrollBar.cpp
+++ b/unity-shared/PlacesOverlayVScrollBar.cpp
@@ -209,9 +209,8 @@ void PlacesOverlayVScrollBar::CheckIfThumbIsInsideSlider()
 {
 nux::Geometry const& slider_geo = _slider->GetAbsoluteGeometry();
 nux::Geometry const& thumb_geo = overlay_window_->GetThumbGeometry();
- nux::Geometry const& intersection = (thumb_geo.Intersect(slider_geo));
 
- if (!intersection.IsNull())
+ if (thumb_geo.IsIntersecting(slider_geo))
 {
 ResetConnector();
 overlay_window_->ThumbInsideSlider();
diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index b233f3067..34bead63d 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -573,7 +573,7 @@ bool PluginAdapter::IsWindowObscured(Window window_id) const
 && sibling->isMapped()
 && sibling->isViewable()
 && (sibling->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE
- && !GetWindowGeometry(sibling->id()).Intersect(win_geo).IsNull())
+ && GetWindowGeometry(sibling->id()).IsIntersecting(win_geo))
 {
 return true;
 }