Merge lp:~3v1n0/unity/panel-shared-dbus-model into lp:unity

[Marco Trevisan (Treviño)]

PanelController: create only one instance of DBusIndicators and share it between Views.

We can just have one dbus-model for indicators, and use it for all our panels.
This saves some unneeded allocations in multi-monitor environments.

In the past I already updated DBusIndicators to be multi-monitor friendly, but I've never shared it between panels.

We can safely do it, having just one DBusProxy that monitors our panel service to update indicators (and to callback it).

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2013-03-05 14:29:18 +0000
+++ panel/PanelController.cpp	2013-04-09 02:13:24 +0000
@@ -79,6 +79,7 @@
   int menus_discovery_;
   int menus_discovery_fadein_;
   int menus_discovery_fadeout_;
+  indicator::DBusIndicators::Ptr dbus_indicators_;
 };
 
 
@@ -90,8 +91,8 @@
   , menus_discovery_(0)
   , menus_discovery_fadein_(0)
   , menus_discovery_fadeout_(0)
-{
-}
+  , dbus_indicators_(std::make_shared<indicator::DBusIndicators>())
+{}
 
 std::vector<Window> Controller::Impl::GetTrayXids() const
 {
@@ -243,7 +244,7 @@
     {
       nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-      PanelView* view = new PanelView();
+      PanelView* view = new PanelView(dbus_indicators_);
       view->SetMaximumHeight(panel::Style::Instance().panel_height);
       view->SetOpacity(opacity_);
       view->SetOpacityMaximizedToggle(opacity_maximized_toggle_);

=== modified file 'panel/PanelIndicatorsView.cpp'
--- panel/PanelIndicatorsView.cpp	2012-12-13 20:06:11 +0000
+++ panel/PanelIndicatorsView.cpp	2013-04-09 02:13:24 +0000
@@ -65,6 +65,9 @@
 
   std::vector<sigc::connection> connections;
 
+  for (auto const& entry : indicator->GetEntries())
+    AddEntry(entry);
+
   auto entry_added_conn = indicator->on_entry_added.connect(sigc::mem_fun(this, &PanelIndicatorsView::OnEntryAdded));
   connections.push_back(entry_added_conn);
 

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2013-03-19 18:47:01 +0000
+++ panel/PanelView.cpp	2013-04-09 02:13:24 +0000
@@ -55,8 +55,9 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(PanelView);
 
-PanelView::PanelView(NUX_FILE_LINE_DECL)
+PanelView::PanelView(indicator::DBusIndicators::Ptr const& remote, NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
+  , remote_(remote)
   , is_dirty_(true)
   , opacity_maximized_toggle_(false)
   , needs_geo_sync_(false)
@@ -105,7 +106,9 @@
   indicators_ = new PanelIndicatorsView();
   AddPanelView(indicators_, 0);
 
-  remote_ = indicator::DBusIndicators::Ptr(new indicator::DBusIndicators());
+  for (auto const& object : remote_->GetIndicators())
+    OnObjectAdded(object);
+
   remote_->on_object_added.connect(sigc::mem_fun(this, &PanelView::OnObjectAdded));
   remote_->on_object_removed.connect(sigc::mem_fun(this, &PanelView::OnObjectRemoved));
   remote_->on_entry_activate_request.connect(sigc::mem_fun(this, &PanelView::OnEntryActivateRequest));

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2013-03-04 23:56:40 +0000
+++ panel/PanelView.h	2013-04-09 02:13:24 +0000
@@ -46,7 +46,7 @@
 {
   NUX_DECLARE_OBJECT_TYPE(PanelView, nux::View);
 public:
-  PanelView(NUX_FILE_LINE_PROTO);
+  PanelView(indicator::DBusIndicators::Ptr const&, NUX_FILE_LINE_PROTO);
   ~PanelView();
 
   void SetPrimary(bool primary);

=== modified file 'panel/StandalonePanel.cpp'
--- panel/StandalonePanel.cpp	2012-12-12 17:30:20 +0000
+++ panel/StandalonePanel.cpp	2013-04-09 02:13:24 +0000
@@ -47,9 +47,13 @@
   }
 
 private:
-  class StandalonePanelView : public PanelView
+  struct StandalonePanelView : public PanelView
   {
     // Used to sync menu geometries
+    StandalonePanelView()
+      : PanelView(std::make_shared<indicator::DBusIndicators>())
+    {}
+
     std::string GetName() const { return "StandalonePanel"; }
   };
 

=== modified file 'tests/test_panel_view.cpp'
--- tests/test_panel_view.cpp	2013-03-04 23:09:52 +0000
+++ tests/test_panel_view.cpp	2013-04-09 02:13:24 +0000
@@ -39,7 +39,7 @@
   nux::ObjectPtr<unity::PanelView> panel_view_;
 
   TestPanelView()
-    : panel_view_(new unity::PanelView())
+    : panel_view_(new unity::PanelView(std::make_shared<unity::indicator::DBusIndicators>()))
   {}
 
 };