Merged with trunk.

(bzr r2861.2.6)

1 files changed, 7 insertions, 5 deletions

diff --git a/unity-standalone/StandaloneUnity.cpp b/unity-standalone/StandaloneUnity.cpp
index ebc649a96..593af9f61 100644
--- a/unity-standalone/StandaloneUnity.cpp
+++ b/unity-standalone/StandaloneUnity.cpp
@@ -86,9 +86,10 @@ UnityStandalone::~UnityStandalone ()
 
 void UnityStandalone::Init ()
 {
- launcher_controller.reset(new launcher::Controller());
- panel_controller.reset(new panel::Controller());
- dash_controller.reset(new dash::Controller());
+ auto xdnd_manager = std::make_shared<XdndManager>();
+ launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager);
+ panel_controller = std::make_shared<panel::Controller>();
+ dash_controller = std::make_shared<dash::Controller>();
 
 dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
 panel_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
@@ -119,8 +120,9 @@ UnityStandaloneTV::~UnityStandaloneTV() {};
 
 void UnityStandaloneTV::Init()
 {
- launcher_controller.reset(new launcher::Controller());
- dash_controller.reset(new dash::Controller());
+ auto xdnd_manager = std::make_shared<XdndManager>();
+ launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager);
+ dash_controller = std::make_shared<dash::Controller>();
 dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
 
 UBusManager().SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION, nullptr);