* Remove ubus usage

(bzr r2892.5.12)

4 files changed, 19 insertions, 24 deletions

diff --git a/unity-shared/PlacesOverlayVScrollBar.cpp b/unity-shared/PlacesOverlayVScrollBar.cpp
index 0087a1b50..c27b913a7 100644
--- a/unity-shared/PlacesOverlayVScrollBar.cpp
+++ b/unity-shared/PlacesOverlayVScrollBar.cpp
@@ -48,21 +48,27 @@ PlacesOverlayVScrollBar::PlacesOverlayVScrollBar(NUX_FILE_LINE_DECL)
 _overlay_window->mouse_move.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseMove));
 _overlay_window->mouse_drag.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseDrag));
 
- _track->geometry_changed.connect([&] (nux::Area* area, nux::Geometry& geo) {
- UpdateStepY();
- _overlay_window->UpdateGeometry(_track->GetAbsoluteGeometry());
+ _track->geometry_changed.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnTrackGeometryChanged));
+ OnVisibleChanged.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnVisibilityChanged));
+}
 
- if (_overlay_window->IsVisible() && content_height_ <= container_height_)
- _overlay_window->ResetStates();
- });
+PlacesOverlayVScrollBar::~PlacesOverlayVScrollBar()
+{
+}
 
- OnVisibleChanged.connect([&] (nux::Area* area, bool visible) {
- _overlay_window->SetVisible(visible);
- });
+void PlacesOverlayVScrollBar::OnTrackGeometryChanged(nux::Area* area, nux::Geometry& geo)
+{
+ UpdateStepY();
+ _overlay_window->UpdateGeometry(_track->GetAbsoluteGeometry());
+
+ if (_overlay_window->IsVisible() && content_height_ <= container_height_)
+ _overlay_window->ResetStates();
 }
 
-PlacesOverlayVScrollBar::~PlacesOverlayVScrollBar()
+void PlacesOverlayVScrollBar::OnVisibilityChanged(nux::Area* area, bool visible)
 {
+ if (_overlay_window->IsVisible() && !visible)
+ _overlay_window->ResetStates();
 }
 
 void PlacesOverlayVScrollBar::SetupAnimation(ScrollDir dir, int stop)
diff --git a/unity-shared/PlacesOverlayVScrollBar.h b/unity-shared/PlacesOverlayVScrollBar.h
index e5ca63ab4..f3c043c10 100644
--- a/unity-shared/PlacesOverlayVScrollBar.h
+++ b/unity-shared/PlacesOverlayVScrollBar.h
@@ -47,6 +47,9 @@ private:
 DOWN,
 };
 
+ void OnTrackGeometryChanged(nux::Area* area, nux::Geometry& geo);
+ void OnVisibilityChanged(nux::Area* area, bool visible);
+
 void OnMouseNear(nux::Point const& mouse_pos);
 void OnMouseBeyond(nux::Point const& mouse_pos);
 void AdjustThumbOffsetFromMouse();
diff --git a/unity-shared/VScrollBarOverlayWindow.cpp b/unity-shared/VScrollBarOverlayWindow.cpp
index f54ea704a..a5c523fb2 100644
--- a/unity-shared/VScrollBarOverlayWindow.cpp
+++ b/unity-shared/VScrollBarOverlayWindow.cpp
@@ -22,7 +22,6 @@
 
 #include "VScrollBarOverlayWindow.h"
 #include "UScreen.h"
-#include "UBusMessages.h"
 #include "DashStyle.h"
 #include "CairoTexture.h"
 
@@ -48,8 +47,6 @@ VScrollBarOverlayWindow::VScrollBarOverlayWindow(nux::Geometry const& geo)
 SetBackgroundColor(nux::color::Transparent);
 
 UpdateTexture();
-
- _ubus_manager.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::mem_fun(this, &VScrollBarOverlayWindow::OnOverlayHidden));
 }
 
 VScrollBarOverlayWindow::~VScrollBarOverlayWindow()
@@ -225,11 +222,6 @@ void VScrollBarOverlayWindow::ShouldHide()
 }
 }
 
-void VScrollBarOverlayWindow::OnOverlayHidden(GVariant* data)
-{
- ResetStates();
-}
-
 void VScrollBarOverlayWindow::ResetStates()
 {
 mouse_down_ = false;
diff --git a/unity-shared/VScrollBarOverlayWindow.h b/unity-shared/VScrollBarOverlayWindow.h
index 3d8f56d36..4b754ef3d 100644
--- a/unity-shared/VScrollBarOverlayWindow.h
+++ b/unity-shared/VScrollBarOverlayWindow.h
@@ -24,8 +24,6 @@
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 
-#include "unity-shared/UBusWrapper.h"
-
 
 class VScrollBarOverlayWindow : public nux::BaseWindow
 {
@@ -78,11 +76,7 @@ private:
 
 void UpdateTexture();
 
- void OnOverlayHidden(GVariant* data);
-
- unity::UBusManager _ubus_manager;
 nux::Geometry content_size_;
-
 nux::ObjectPtr<nux::BaseTexture> thumb_texture_;
 
 int content_offset_x_;