Merge lp:~3v1n0/unity/launcher-controller-ensure-new into lp:unity

[Marco Trevisan (Treviño)]

LauncherController: Rewritten EnsureLaunchers() added tests, fix a crash caused by invalid barrier subscriptions.

Rewritten the EnsureLaunchers() method LauncherController and added unit tests for it.

As discussed with Tim LauncherControllerTest is now friend of LauncherController to access to the pimpl data, even if I've changed this on my next branch.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2553
http://jenkins.qa.ubuntu.com/job/unity-ci/124/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/124/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/124/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Looks good.

There are some merge markers in added file 'tests/test_launcher_controller.cpp'.

General comments:

 * If you want to avoid the friend declaration, you can do something like this:
   class TestLauncherExpectationsInterface
   {
       public:
           virtual void ExpectNumControllers (int num) = 0;
           ...
   }

   LauncherControllerPrivate::SetExpectations (TestLauncherExpectationsInterface *expect)
   {
       ...
       expect->ExpectNumControllers (whatever);
   }

   ::testing::NiceMock <MockLauncherExpectations> mock_launcher_expectations;

   EXPECT_CALL (mock_launcher_expectations, ExpectNumControllers (value));

   This method is pretty ugly though, and the friend might be better. Generally speaking, testing implementation details isn't really recommended, but in this case we want to do that.

 * Its a bit unclear as to how UScreen.SetupFakeMultimonitor () causes more launchers to be added to an lc it doesn't know about, unless some singleton knows about lc, and that's pretty confusing.

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

> Looks good.
>
> There are some merge markers in added file
> 'tests/test_launcher_controller.cpp'.

Yeah, fixed...

> General comments:
>
> * If you want to avoid the friend declaration, you can do something like
> [...]
> This method is pretty ugly though, and the friend might be better.

Yes, that's what I generally do, but I didn't want all this even for future testing...

> Generally speaking, testing implementation details isn't really recommended,
> but in this case we want to do that.

Yep, that's the fact.

> * Its a bit unclear as to how UScreen.SetupFakeMultimonitor () causes more
> launchers to be added to an lc it doesn't know about, unless some singleton
> knows about lc, and that's pretty confusing.

As you can see, int SetupFakeMultimonitor implementation, basically I'm adding to it some fake monitors, and then emitting that UScreen has changed, exactly like if I'd have plugged some monitors.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:2554
http://jenkins.qa.ubuntu.com/job/unity-ci/125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=amd64/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-ci/./distribution=quantal,flavor=i386/125/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Sorry for the jenkins failure. I'm looking into this.

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/967/console reported an error when processing this lp:~3v1n0/unity/launcher-controller-ensure-new branch.
Not merging it.

[Martin Mrazik (mrazik)]

Now I'm a bit confused. I thought the CI failure is because our jenkins quantal slaves were not 100% up-to-date as I was able to compile the latest trunk on my quantal laptop with staging PPA.
Now it looks like the unity-merger has a similar problem so let me look close into this.

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2012-07-20 19:26:15 +0000
+++ launcher/EdgeBarrierController.cpp	2012-07-26 13:13:33 +0000
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include "EdgeBarrierController.h"
@@ -157,7 +158,7 @@
   unsigned int monitor = owner->index;
   bool process = true;
 
-  if (monitor <= subscribers_.size())
+  if (monitor < subscribers_.size())
   {
     auto subscriber = subscribers_[monitor];
 
@@ -206,20 +207,32 @@
 
 void EdgeBarrierController::Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor)
 {
-  if (pimpl->subscribers_.size() <= monitor)
+  if (monitor >= pimpl->subscribers_.size())
     pimpl->subscribers_.resize(monitor + 1);
 
+  auto const& monitors = UScreen::GetDefault()->GetMonitors();
   pimpl->subscribers_[monitor] = subscriber;
-  pimpl->SetupBarriers(UScreen::GetDefault()->GetMonitors());
+  pimpl->ResizeBarrierList(monitors);
+  pimpl->SetupBarriers(monitors);
 }
 
 void EdgeBarrierController::Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor)
 {
-  if (pimpl->subscribers_.size() < monitor || pimpl->subscribers_[monitor] != subscriber)
+  if (monitor >= pimpl->subscribers_.size() || pimpl->subscribers_[monitor] != subscriber)
     return;
 
+  auto const& monitors = UScreen::GetDefault()->GetMonitors();
   pimpl->subscribers_[monitor] = nullptr;
-  pimpl->SetupBarriers(UScreen::GetDefault()->GetMonitors());
+  pimpl->ResizeBarrierList(monitors);
+  pimpl->SetupBarriers(monitors);
+}
+
+EdgeBarrierSubscriber* EdgeBarrierController::GetSubscriber(unsigned int monitor)
+{
+  if (monitor >= pimpl->subscribers_.size())
+    return nullptr;
+
+  return pimpl->subscribers_[monitor];
 }
 
 void EdgeBarrierController::ProcessBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event)

=== modified file 'launcher/EdgeBarrierController.h'
--- launcher/EdgeBarrierController.h	2012-07-20 18:33:58 +0000
+++ launcher/EdgeBarrierController.h	2012-07-26 13:13:33 +0000
@@ -43,6 +43,7 @@
 
   void Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
   void Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
+  EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor);
 
 protected:
   void ProcessBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event);

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-07-25 02:39:32 +0000
+++ launcher/LauncherController.cpp	2012-07-26 13:13:33 +0000
@@ -30,23 +30,15 @@
 #include "BamfLauncherIcon.h"
 #include "DesktopLauncherIcon.h"
 #include "DeviceLauncherIcon.h"
-#include "DeviceLauncherSection.h"
-#include "EdgeBarrierController.h"
 #include "FavoriteStore.h"
 #include "HudLauncherIcon.h"
-#include "Launcher.h"
 #include "LauncherController.h"
-#include "LauncherEntryRemote.h"
-#include "LauncherEntryRemoteModel.h"
-#include "AbstractLauncherIcon.h"
+#include "LauncherControllerPrivate.h"
 #include "SoftwareCenterLauncherIcon.h"
-#include "LauncherModel.h"
-#include "VolumeMonitorWrapper.h"
 #include "unity-shared/WindowManager.h"
 #include "TrashLauncherIcon.h"
 #include "BFBLauncherIcon.h"
 #include "unity-shared/UScreen.h"
-#include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/TimeUtil.h"
 
@@ -93,120 +85,7 @@
 }
 }
 
-class Controller::Impl
-{
-public:
-  Impl(Display* display, Controller* parent);
-  ~Impl();
-
-  void UpdateNumWorkspaces(int workspaces);
-
-  Launcher* CreateLauncher(int monitor);
-
-  void Save();
-  void SortAndUpdate();
-
-  nux::ObjectPtr<Launcher> CurrentLauncher();
-
-  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
-  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
-
-  void OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before);
-  void OnLauncherAddRequestSpecial(std::string const& path, std::string const& aptdaemon_trans_id,
-                                   std::string const& icon_path, int icon_x, int icon_y, int icon_size);
-  void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon);
-  void OnSCIconAnimationComplete(AbstractLauncherIcon::Ptr icon);
-
-  void OnLauncherEntryRemoteAdded(LauncherEntryRemote::Ptr const& entry);
-  void OnLauncherEntryRemoteRemoved(LauncherEntryRemote::Ptr const& entry);
-
-  void OnFavoriteStoreFavoriteAdded(std::string const& entry, std::string const& pos, bool before);
-  void OnFavoriteStoreFavoriteRemoved(std::string const& entry);
-  void OnFavoriteStoreReordered();
-
-
-  void InsertExpoAction();
-  void RemoveExpoAction();
-
-  void InsertDesktopIcon();
-  void RemoveDesktopIcon();
-
-  void SendHomeActivationRequest();
-
-  int MonitorWithMouse();
-
-  void InsertTrash();
-
-  void RegisterIcon(AbstractLauncherIcon::Ptr icon);
-
-  AbstractLauncherIcon::Ptr CreateFavorite(const char* file_path);
-
-  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
-
-  void SetupBamf();
-
-  void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
-
-  void OnExpoActivated();
-
-  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
-
-  void OnWindowFocusChanged (guint32 xid);
-
-  void OnViewOpened(BamfMatcher* matcher, BamfView* view);
-
-  void ReceiveMouseDownOutsideArea(int x, int y, unsigned long button_flags, unsigned long key_flags);
-
-  void ReceiveLauncherKeyPress(unsigned long eventType,
-                               unsigned long keysym,
-                               unsigned long state,
-                               const char* character,
-                               unsigned short keyCount);
-
-  static void OnBusAcquired(GDBusConnection* connection, const gchar* name, gpointer user_data);
-  static void OnDBusMethodCall(GDBusConnection* connection, const gchar* sender, const gchar* object_path,
-                               const gchar* interface_name, const gchar* method_name,
-                               GVariant* parameters, GDBusMethodInvocation* invocation,
-                               gpointer user_data);
-
-  static GDBusInterfaceVTable interface_vtable;
-
-  Controller* parent_;
-  LauncherModel::Ptr model_;
-  nux::ObjectPtr<Launcher> launcher_;
-  nux::ObjectPtr<Launcher> keyboard_launcher_;
-  int                    sort_priority_;
-  AbstractVolumeMonitorWrapper::Ptr volume_monitor_;
-  DeviceLauncherSection  device_section_;
-  LauncherEntryRemoteModel remote_model_;
-  AbstractLauncherIcon::Ptr expo_icon_;
-  AbstractLauncherIcon::Ptr desktop_icon_;
-  int                    num_workspaces_;
-  bool                   show_desktop_icon_;
-  Display*               display_;
-
-  bool                   launcher_open;
-  bool                   launcher_keynav;
-  bool                   launcher_grabbed;
-  bool                   reactivate_keynav;
-  int                    reactivate_index;
-  bool                   keynav_restore_window_;
-  int                    launcher_key_press_time_;
-  unsigned int           dbus_owner_;
-
-  ui::EdgeBarrierController edge_barriers_;
-
-  LauncherList launchers;
-
-  glib::Object<BamfMatcher> matcher_;
-  glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
-  glib::SourceManager sources_;
-  UBusManager ubus;
-
-  sigc::connection on_expoicon_activate_connection_;
-  sigc::connection launcher_key_press_connection_;
-  sigc::connection launcher_event_outside_connection_;
-};
+
 
 GDBusInterfaceVTable Controller::Impl::interface_vtable =
   { Controller::Impl::OnDBusMethodCall, NULL, NULL};
@@ -316,41 +195,35 @@
   unsigned int num_monitors = monitors.size();
   unsigned int num_launchers = parent_->multiple_launchers ? num_monitors : 1;
   unsigned int launchers_size = launchers.size();
-  unsigned int last_monitor = 0;
-
-  if (num_launchers == 1)
-  {
-    if (launchers_size == 0)
-    {
-      launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(primary)));
-    }
-    else if (!launchers[0].IsValid())
-    {
-      launchers[0] = nux::ObjectPtr<Launcher>(CreateLauncher(primary));
-    }
-
-    launchers[0]->monitor(primary);
-    launchers[0]->Resize();
-    last_monitor = 1;
-  }
-  else
-  {
-    for (unsigned int i = 0; i < num_monitors; i++, last_monitor++)
-    {
-      if (i >= launchers_size)
-      {
-        launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(i)));
-      }
-
-      launchers[i]->monitor(i);
-      launchers[i]->Resize();
-    }
-  }
-
-  for (unsigned int i = last_monitor; i < launchers_size; ++i)
+  unsigned int last_launcher = 0;
+
+  for (unsigned int i = 0; i < num_launchers; i++, last_launcher++)
+  {
+    if (i >= launchers_size)
+    {
+      launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(i)));
+    }
+    else if (!launchers[i])
+    {
+      launchers[i] = nux::ObjectPtr<Launcher>(CreateLauncher(i));
+    }
+
+    int monitor = (num_launchers == 1) ? primary : i;
+
+    if (launchers[i]->monitor() != monitor)
+    {
+      edge_barriers_.Unsubscribe(launchers[i].GetPointer(), launchers[i]->monitor);
+    }
+
+    launchers[i]->monitor(monitor);
+    launchers[i]->Resize();
+    edge_barriers_.Subscribe(launchers[i].GetPointer(), launchers[i]->monitor);
+  }
+
+  for (unsigned int i = last_launcher; i < launchers_size; ++i)
   {
     auto launcher = launchers[i];
-    if (launcher.IsValid())
+    if (launcher)
     {
       parent_->RemoveChild(launcher.GetPointer());
       launcher->GetParent()->UnReference();
@@ -359,11 +232,6 @@
   }
 
   launchers.resize(num_launchers);
-
-  for (size_t i = 0; i < launchers.size(); ++i)
-  {
-    edge_barriers_.Subscribe(launchers[i].GetPointer(), launchers[i]->monitor);
-  }
 }
 
 void Controller::Impl::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)

=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2012-06-18 02:57:23 +0000
+++ launcher/LauncherController.h	2012-07-26 13:13:33 +0000
@@ -35,6 +35,7 @@
 class AbstractLauncherIcon;
 class Launcher;
 class LauncherModel;
+class TestLauncherController;
 
 class Controller : public unity::debug::Introspectable, public sigc::trackable
 {
@@ -86,6 +87,7 @@
   void AddProperties(GVariantBuilder* builder);
 
 private:
+  friend class TestLauncherController;
   class Impl;
   std::unique_ptr<Impl> pimpl;
 };

=== added file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	1970-01-01 00:00:00 +0000
+++ launcher/LauncherControllerPrivate.h	2012-07-26 13:13:33 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Tim Penhey <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
+ */
+
+#ifndef LAUNCHER_CONTROLLER_PRIVATE_H
+#define LAUNCHER_CONTROLLER_PRIVATE_H
+
+#include <Nux/Nux.h>
+
+#include "AbstractLauncherIcon.h"
+#include "DeviceLauncherSection.h"
+#include "EdgeBarrierController.h"
+#include "LauncherController.h"
+#include "Launcher.h"
+#include "LauncherEntryRemote.h"
+#include "LauncherEntryRemoteModel.h"
+#include "LauncherModel.h"
+#include "SoftwareCenterLauncherIcon.h"
+#include "unity-shared/UBusWrapper.h"
+#include "VolumeMonitorWrapper.h"
+
+namespace unity
+{
+namespace launcher
+{
+
+class Controller::Impl
+{
+public:
+  Impl(Display* display, Controller* parent);
+  ~Impl();
+
+  void UpdateNumWorkspaces(int workspaces);
+
+  Launcher* CreateLauncher(int monitor);
+
+  void Save();
+  void SortAndUpdate();
+
+  nux::ObjectPtr<Launcher> CurrentLauncher();
+
+  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
+  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
+
+  void OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before);
+  void OnLauncherAddRequestSpecial(std::string const& path, std::string const& aptdaemon_trans_id,
+                                   std::string const& icon_path, int icon_x, int icon_y, int icon_size);
+  void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon);
+  void OnSCIconAnimationComplete(AbstractLauncherIcon::Ptr icon);
+
+  void OnLauncherEntryRemoteAdded(LauncherEntryRemote::Ptr const& entry);
+  void OnLauncherEntryRemoteRemoved(LauncherEntryRemote::Ptr const& entry);
+
+  void OnFavoriteStoreFavoriteAdded(std::string const& entry, std::string const& pos, bool before);
+  void OnFavoriteStoreFavoriteRemoved(std::string const& entry);
+  void OnFavoriteStoreReordered();
+
+
+  void InsertExpoAction();
+  void RemoveExpoAction();
+
+  void InsertDesktopIcon();
+  void RemoveDesktopIcon();
+
+  void SendHomeActivationRequest();
+
+  int MonitorWithMouse();
+
+  void InsertTrash();
+
+  void RegisterIcon(AbstractLauncherIcon::Ptr icon);
+
+  AbstractLauncherIcon::Ptr CreateFavorite(const char* file_path);
+
+  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
+
+  void SetupBamf();
+
+  void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
+
+  void OnExpoActivated();
+
+  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
+
+  void OnWindowFocusChanged (guint32 xid);
+
+  void OnViewOpened(BamfMatcher* matcher, BamfView* view);
+
+  void ReceiveMouseDownOutsideArea(int x, int y, unsigned long button_flags, unsigned long key_flags);
+
+  void ReceiveLauncherKeyPress(unsigned long eventType,
+                               unsigned long keysym,
+                               unsigned long state,
+                               const char* character,
+                               unsigned short keyCount);
+
+  static void OnBusAcquired(GDBusConnection* connection, const gchar* name, gpointer user_data);
+  static void OnDBusMethodCall(GDBusConnection* connection, const gchar* sender, const gchar* object_path,
+                               const gchar* interface_name, const gchar* method_name,
+                               GVariant* parameters, GDBusMethodInvocation* invocation,
+                               gpointer user_data);
+
+  static GDBusInterfaceVTable interface_vtable;
+
+  Controller* parent_;
+  LauncherModel::Ptr model_;
+  nux::ObjectPtr<Launcher> launcher_;
+  nux::ObjectPtr<Launcher> keyboard_launcher_;
+  int                    sort_priority_;
+  AbstractVolumeMonitorWrapper::Ptr volume_monitor_;
+  DeviceLauncherSection  device_section_;
+  LauncherEntryRemoteModel remote_model_;
+  AbstractLauncherIcon::Ptr expo_icon_;
+  AbstractLauncherIcon::Ptr desktop_icon_;
+  int                    num_workspaces_;
+  bool                   show_desktop_icon_;
+  Display*               display_;
+
+  bool                   launcher_open;
+  bool                   launcher_keynav;
+  bool                   launcher_grabbed;
+  bool                   reactivate_keynav;
+  int                    reactivate_index;
+  bool                   keynav_restore_window_;
+  int                    launcher_key_press_time_;
+  unsigned int           dbus_owner_;
+
+  ui::EdgeBarrierController edge_barriers_;
+
+  LauncherList launchers;
+
+  glib::Object<BamfMatcher> matcher_;
+  glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
+  glib::SourceManager sources_;
+  UBusManager ubus;
+
+  sigc::connection on_expoicon_activate_connection_;
+  sigc::connection launcher_key_press_connection_;
+  sigc::connection launcher_event_outside_connection_;
+};
+
+} // launcher namespace
+} // unity namespace
+
+#endif

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-07-24 23:09:24 +0000
+++ tests/CMakeLists.txt	2012-07-26 13:13:33 +0000
@@ -217,6 +217,7 @@
                  test_hud_view.cpp
                  test_icon_loader.cpp
                  test_im_text_entry.cpp
+                 test_launcher_controller.cpp
                  test_keyboard_util.cpp
                  test_resultviewgrid.cpp
                  test_single_monitor_launcher_icon.cpp
@@ -239,9 +240,11 @@
                  ${CMAKE_SOURCE_DIR}/hud/HudView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/BamfLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/BFBLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Decaymulator.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/DesktopLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DeviceLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DeviceLauncherSection.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DevicesSettings.cpp
@@ -251,9 +254,12 @@
                  ${CMAKE_SOURCE_DIR}/launcher/FavoriteStoreGSettings.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/GeisAdapter.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/HudLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Launcher.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/LauncherController.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherDragWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemoteModel.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherHideMachine.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherHoverMachine.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherIcon.cpp
@@ -271,11 +277,14 @@
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SimpleLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SingleMonitorLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SoftwareCenterLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SpacerLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SwitcherController.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SwitcherModel.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SwitcherView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Tooltip.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/TrashLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/VolumeMonitorWrapper.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Animator.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/BackgroundEffectHelper.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/DashStyle.cpp

=== modified file 'tests/test_edge_barrier_controller.cpp'
--- tests/test_edge_barrier_controller.cpp	2012-07-20 18:34:34 +0000
+++ tests/test_edge_barrier_controller.cpp	2012-07-26 13:13:33 +0000
@@ -20,9 +20,9 @@
 
 #include <gmock/gmock.h>
 #include "test_utils.h"
+#include "test_uscreen_mock.h"
 
 #include "EdgeBarrierController.h"
-#include "MultiMonitor.h"
 
 using namespace unity;
 using namespace unity::ui;
@@ -53,6 +53,11 @@
   {
     EdgeBarrierController::ProcessBarrierEvent(owner, event);
   }
+
+  EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor)
+  {
+    return EdgeBarrierController::GetSubscriber(monitor);
+  }
 };
 
 class TestBarrierSubscriber : public EdgeBarrierSubscriber
@@ -79,6 +84,8 @@
     bc.options()->edge_resist = true;
     bc.options()->edge_passed_disabled_ms = 150;
 
+    uscreen.SetupFakeMultiMonitor();
+
     for (int i = 0; i < max_num_monitors; ++i)
     {
       // By default we assume that no subscriber handles the events!!!
@@ -93,12 +100,38 @@
   }
 
   TestBarrierSubscriber subscribers_[max_num_monitors];
+  MockUScreen uscreen;
   MockEdgeBarrierController bc;
 };
 
 TEST_F(TestEdgeBarrierController, Construction)
 {
   EXPECT_TRUE(bc.sticky_edges);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_EQ(bc.GetSubscriber(i), &subscribers_[i]);
+}
+
+TEST_F(TestEdgeBarrierController, Unsubscribe)
+{
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    bc.Unsubscribe(&subscribers_[i], i);
+    ASSERT_EQ(bc.GetSubscriber(i), nullptr);
+  }
+}
+
+TEST_F(TestEdgeBarrierController, UnsubscribeInvalid)
+{
+  bc.Unsubscribe(&subscribers_[2], 1);
+  ASSERT_EQ(bc.GetSubscriber(2), &subscribers_[2]);
+}
+
+TEST_F(TestEdgeBarrierController, SubscriberReplace)
+{
+  TestBarrierSubscriber handling_subscriber(true);
+  bc.Subscribe(&handling_subscriber, 0);
+  EXPECT_EQ(bc.GetSubscriber(0), &handling_subscriber);
 }
 
 TEST_F(TestEdgeBarrierController, ProcessHandledEvent)
@@ -141,6 +174,20 @@
   bc.ProcessBarrierEvent(&owner, breaking_barrier_event);
 }
 
+TEST_F(TestEdgeBarrierController, ProcessUnHandledEventBreakingBarrierOnMaxMonitor)
+{
+  int monitor = max_num_monitors;
+
+  MockPointerBarrier owner(monitor);
+  auto breaking_barrier_event = MakeBarrierEvent(0, true);
+
+  // This was leading to a crash, see bug #1020075
+  // you can reproduce this repeating this test multiple times using the
+  // --gtest_repeat=X command line
+  EXPECT_CALL(owner, ReleaseBarrier(_));
+  bc.ProcessBarrierEvent(&owner, breaking_barrier_event);
+}
+
 TEST_F(TestEdgeBarrierController, ProcessUnHandledEventNotBreakingBarrier)
 {
   int monitor = 2;

=== added file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_launcher_controller.cpp	2012-07-26 13:13:33 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+#include "test_uscreen_mock.h"
+
+#include "FavoriteStore.h"
+#include "LauncherController.h"
+#include "LauncherControllerPrivate.h"
+#include "PanelStyle.h"
+#include "UnitySettings.h"
+
+using namespace unity::launcher;
+using namespace testing;
+
+namespace unity
+{
+
+class MockFavoriteStore : public FavoriteStore
+{
+public:
+  FavoriteList const& GetFavorites()
+  {
+    return fav_list_;
+  };
+
+  void AddFavorite(std::string const& desktop_path, int position) {};
+  void RemoveFavorite(std::string const& desktop_path) {};
+  void MoveFavorite(std::string const& desktop_path, int position) {};
+  void SetFavorites(FavoriteList const& desktop_paths) {};
+
+private:
+  FavoriteList fav_list_;
+};
+
+namespace launcher
+{
+class TestLauncherController : public testing::Test
+{
+public:
+  TestLauncherController()
+    : lc(nux::GetGraphicsDisplay()->GetX11Display())
+  {}
+
+  virtual void SetUp()
+  {
+    lc.options = std::make_shared<Options>();
+    lc.multiple_launchers = true;
+  }
+
+protected:
+  ui::EdgeBarrierController &GetBarrierController()
+  {
+    return lc.pimpl->edge_barriers_;
+  }
+
+  MockUScreen uscreen;
+  Settings settings;
+  panel::Style panel_style;
+  MockFavoriteStore favorite_store;
+  GeisAdapter geis_adapter;
+  Controller lc;
+};
+}
+
+TEST_F(TestLauncherController, Construction)
+{
+  EXPECT_NE(lc.options(), nullptr);
+  EXPECT_TRUE(lc.multiple_launchers());
+}
+
+TEST_F(TestLauncherController, MultimonitorMultipleLaunchers)
+{
+  lc.multiple_launchers = true;
+  uscreen.SetupFakeMultiMonitor();
+
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+  }
+}
+
+TEST_F(TestLauncherController, MultimonitorSingleLauncher)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor(0, false);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    uscreen.SetPrimary(i);
+    ASSERT_EQ(lc.launchers().size(), 1);
+    EXPECT_EQ(lc.launcher().monitor(), i);
+  }
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToMultipleLaunchers)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor();
+
+  ASSERT_EQ(lc.launchers().size(), 1);
+
+  lc.multiple_launchers = true;
+  EXPECT_EQ(lc.launchers().size(), max_num_monitors);
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToSingleLauncher)
+{
+  lc.multiple_launchers = true;
+  int primary = 3;
+  uscreen.SetupFakeMultiMonitor(primary);
+
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  lc.multiple_launchers = false;
+  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launcher().monitor(), primary);
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToSingleMonitor)
+{
+  uscreen.SetupFakeMultiMonitor();
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  uscreen.Reset();
+  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launcher().monitor(), 0);
+}
+
+TEST_F(TestLauncherController, MultimonitorRemoveMiddleMonitor)
+{
+  uscreen.SetupFakeMultiMonitor();
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  std::vector<nux::Geometry> &monitors = uscreen.GetMonitors();
+  monitors.erase(monitors.begin() + monitors.size()/2);
+  uscreen.changed.emit(uscreen.GetPrimaryMonitor(), uscreen.GetMonitors());
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors - 1);
+
+  for (int i = 0; i < max_num_monitors - 1; ++i)
+    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+}
+
+TEST_F(TestLauncherController, SingleMonitorSwitchToMultimonitor)
+{
+  ASSERT_EQ(lc.launchers().size(), 1);
+
+  uscreen.SetupFakeMultiMonitor();
+
+  EXPECT_EQ(lc.launchers().size(), max_num_monitors);
+}
+
+TEST_F(TestLauncherController, MultiMonitorEdgeBarrierSubscriptions)
+{
+  uscreen.SetupFakeMultiMonitor();
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_EQ(GetBarrierController().GetSubscriber(i), lc.launchers()[i].GetPointer());
+}
+
+TEST_F(TestLauncherController, SingleMonitorEdgeBarrierSubscriptionsUpdates)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor(0, false);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    uscreen.SetPrimary(i);
+
+    for (int j = 0; j < max_num_monitors; ++j)
+    {
+      if (j == i)
+      {
+        ASSERT_EQ(GetBarrierController().GetSubscriber(j), &lc.launcher());
+      }
+      else
+      {
+        ASSERT_EQ(GetBarrierController().GetSubscriber(j), nullptr);
+      }
+    }
+  }
+}
+
+}

=== added file 'tests/test_uscreen_mock.h'
--- tests/test_uscreen_mock.h	1970-01-01 00:00:00 +0000
+++ tests/test_uscreen_mock.h	2012-07-26 13:13:33 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+
+ */
+
+#ifndef TEST_USCREEN_MOCK_H
+#define TEST_USCREEN_MOCK_H
+
+#include "MultiMonitor.h"
+#include "UScreen.h"
+
+namespace unity
+{
+
+const unsigned MONITOR_WIDTH = 1024;
+const unsigned MONITOR_HEIGHT = 768;
+
+class MockUScreen : public UScreen
+{
+public:
+  MockUScreen()
+  {
+    Reset(false);
+  }
+
+  ~MockUScreen()
+  {
+    if (default_screen_ == this)
+      default_screen_ = nullptr;
+  }
+
+  void Reset(bool emit = true)
+  {
+    default_screen_ = this;
+    primary_ = 0;
+    monitors_ = {nux::Geometry(0, 0, MONITOR_WIDTH, MONITOR_HEIGHT)};
+
+    changed.emit(primary_, monitors_);
+  }
+
+  void SetupFakeMultiMonitor(int primary = 0, bool emit_update = true)
+  {
+    SetPrimary(primary, false);
+    monitors_.clear();
+
+    for (int i = 0, total_width = 0; i < max_num_monitors; ++i)
+    {
+      monitors_.push_back(nux::Geometry(MONITOR_WIDTH, MONITOR_HEIGHT, total_width, 0));
+      total_width += MONITOR_WIDTH;
+
+      if (emit_update)
+        changed.emit(GetPrimaryMonitor(), GetMonitors());
+    }
+  }
+
+  void SetPrimary(int primary, bool emit = true)
+  {
+    if (primary_ != primary)
+    {
+      primary_ = primary;
+
+      if (emit)
+        changed.emit(primary_, monitors_);
+    }
+  }
+};
+
+}
+
+#endif
\ No newline at end of file

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2012-06-18 02:57:23 +0000
+++ unity-shared/UScreen.cpp	2012-07-26 13:13:33 +0000
@@ -24,17 +24,18 @@
 
 namespace
 {
-static UScreen* default_screen_ = nullptr;
 nux::logging::Logger logger("unity.screen");
 }
 
+UScreen* UScreen::default_screen_ = nullptr;
+
 UScreen::UScreen()
-  : screen_(gdk_screen_get_default(), glib::AddRef())
+  : primary_(0)
+  , screen_(gdk_screen_get_default(), glib::AddRef())
   , proxy_("org.freedesktop.UPower",
            "/org/freedesktop/UPower",
            "org.freedesktop.UPower",
            G_BUS_TYPE_SYSTEM)
-  , primary_(0)
 {
   size_changed_signal_.Connect(screen_, "size-changed", sigc::mem_fun(this, &UScreen::Changed));
   monitors_changed_signal_.Connect(screen_, "monitors-changed", sigc::mem_fun(this, &UScreen::Changed));

=== modified file 'unity-shared/UScreen.h'
--- unity-shared/UScreen.h	2012-06-18 02:57:23 +0000
+++ unity-shared/UScreen.h	2012-07-26 13:13:33 +0000
@@ -55,14 +55,17 @@
   void Changed(GdkScreen* screen);
   void Refresh();
 
-private:
+protected:
+  static UScreen* default_screen_;
   std::vector<nux::Geometry> monitors_;
+  int primary_;
+
+private:
   glib::Object<GdkScreen> screen_;
   glib::DBusProxy proxy_;
   glib::Signal<void, GdkScreen*> size_changed_signal_;
   glib::Signal<void, GdkScreen*> monitors_changed_signal_;
   glib::Source::UniquePtr refresh_idle_;
-  int primary_;
 };
 
 } // Namespace