summaryrefslogtreecommitdiff
path: root/plugins
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-02-13 01:51:59 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-02-13 01:51:59 +0100
commitfad51c86e0e2ea86cbe8c5d4c3d970ee9dcd6a27 (patch)
treee71de53aa1cc45eb2be6f3bf6e111995c7b76f45 /plugins
parent43f426612fe3fff35fd751e5cd2d9f74192abdfb (diff)
DecorationsManager: Add menu::Manager as construction parameter and use it
We now have proper keyboard activation for indicator menus, and also we share the same indicator-entries and dbus indicators with all the panels. (bzr r3566.5.394)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/unityshell/src/unityshell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index c84b9b1e4..5cde27206 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -150,7 +150,7 @@ UnityScreen::UnityScreen(CompScreen* screen)
, cScreen(CompositeScreen::get(screen))
, gScreen(GLScreen::get(screen))
, menus_(std::make_shared<menu::Manager>(std::make_shared<indicator::DBusIndicators>(), std::make_shared<key::GnomeGrabber>()))
- , deco_manager_(std::make_shared<decoration::Manager>())
+ , deco_manager_(std::make_shared<decoration::Manager>(menus_))
, debugger_(this)
, needsRelayout(false)
, super_keypressed_(false)