Merge lp:~bregma/unity/7.2.1 into lp:unity/7.2

[Stephen M. Webb]

released upstream micro-release 7.2.1

Upstream micro-release 7.2.1 containing the following SRU fixes.

#1312749: German translation: password wrong text is too long and destroys layout
#1251193: Language issue from the unity lense screen
#1313280: Fullscreen window set to "Always on Top" in single-monitor will hide the lockscreen
#1221673: compiz crashed with SIGSEGV in CompAction::initiate()
#1307748: xpathselect attribute matching doesn't match anything other than object Ids
#1317276: Unity 7 GCC ICE on ARM64
#1291461: Lockscreen: keyboard layout switching shortcuts not working

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2014-03-31 18:00:13 +0000
+++ AUTHORS	2014-05-13 20:01:30 +0000
@@ -13,6 +13,7 @@
  Alex Launi <[e-mail]>
  Alex Launi <[e-mail]>, Allan LeSage <[e-mail]>
  Alex Launi <[e-mail]>, Thomi Richards <[e-mail]>
+ Alfred Neumayer <[e-mail]>
  Andrea Azzarone
  Andrea Azzarone <[e-mail]>
  Andrea Cimitan <[e-mail]>
@@ -44,8 +45,8 @@
  Christopher Lee <[e-mail]>, Thomi Richards <[e-mail]>
  Christopher Lee <[e-mail]>
  Christopher Townsend <[e-mail]>
+ Chris Townsend <[e-mail]>
  Chris Townsend <[e-mail]>
- Chris Townsend <[e-mail]>
  CI bot <[e-mail]>
  Daniel d'Andrada <[e-mail]>
  Daniel van Vugt <[e-mail]>
@@ -86,6 +87,7 @@
  Jay Taoko <[e-mail]>, Mirco Müller <[e-mail]>
  Jay Taoko <[e-mail]>, Robert Carr <[e-mail]>
  Jeremy Bicha <[e-mail]>
+ Jinkyu Yi <[e-mail]>
  [e-mail]
  Jussi Pakkanen <[e-mail]>
  Ken VanDine <[e-mail]>
@@ -100,6 +102,7 @@
  Luke Yelavich <[e-mail]>
  Manuel de la Pena <[e-mail]>
  Manuel de la Pena <[e-mail]>, Nick Dedekind <[e-mail]>, Pawel Stolowski <[e-mail]>, Michal Hruby <[e-mail]>, Łukasz 'sil2100' Zemczak <[e-mail]>, Marco Trevisan (Treviño) <[e-mail]>, Automatic PS uploader <[e-mail]>, Chris Townsend <[e-mail]>, Andrea Azzarone <[e-mail]>
+ Marc Deslauriers <[e-mail]>
  Marco Biscaro <[e-mail]>
  Marco Biscaro <[e-mail]>, Rick Spencer <[e-mail]>
  Marco Mariani <[e-mail]>, Thomi Richards <[e-mail]>
@@ -108,6 +111,7 @@
  Marco Trevisan <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, 3v1n0 <[e-mail]>
+ Marco Trevisan (Treviño) <[e-mail]>, Andrea Azzarone <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Andrea Cimitan <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Brandon Schaefer <[e-mail]>
  Marco Trevisan (Treviño) <[e-mail]>, Brandon Schaefer <[e-mail]>, Tim Penhey <[e-mail]>
@@ -168,6 +172,7 @@
  Rodrigo Moya <[e-mail]>
  Romain Perier <[e-mail]>
  Ryan Lortie <[e-mail]>
+ Sami Jaktholm <[e-mail]>
  Sam Spilsbury <[e-mail]>
  Sam Spilsbury <[e-mail]>, Andrea Azzarone <[e-mail]>
  Sam Spilsbury <[e-mail]>, Daniel van Vugt <[e-mail]>

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-31 18:00:13 +0000
+++ CMakeLists.txt	2014-05-13 20:01:30 +0000
@@ -10,7 +10,7 @@
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
 set (UNITY_MINOR 2)
-set (UNITY_MICRO 0)
+set (UNITY_MICRO 1)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")

=== modified file 'ChangeLog'
--- ChangeLog	2014-03-31 18:00:13 +0000
+++ ChangeLog	2014-05-13 20:01:30 +0000
@@ -1,3 +1,1162 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: updated with additional lockscreen changes
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1317276
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers on arm64 Ubuntu package builds
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	disabled precompiled headers for arm64 arch, it seems to cause random ICEs
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	lockscreen/LockScreenAccelerators.h: added required header for std:vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added missing header for std::vector definition
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1312749
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Set the max width, so our static text wraps. So we don't end up rendering text out of the view area.
+
[phone]  Jonas Schwabe
+
+	* Set the max width, so the static text wraps (and doesn't go out of the view!)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1307748
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: GetPropertyValue should return a proper value only if we've a valid array
+	
+	Improve debugging messages and fix leaks.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DebugDBusInterface: match properties if they are in the AP array form [<type>, <value>]
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1221673
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PluginAdapter: make sure we don't try to call an invalid initiate/terminate callback function
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1313280
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
+	
+	Some code cleanup, factorizing similar code.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Mergin with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/lockscreen-keys-disable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Get the Hud initialization event if unity is locked
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: if the screen is grabbed when showing the Hud, wait for ungrab for a couple of seconds
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: don't try to show Dash/Hud if the screen is grabbed
+	
+	Also move the dash opening out from LauncherController, and get rid of UBus
+	as first initialization source, that can only slow things down here.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DashController: return a bool in ShowDash, wait for ungrab for 2 seconds maximum
+	
+	Now if the screen is grabbed, we just wait a couple of seconds the ungrab-event.
+	If that happens in such timeframe then we show the dash, otherwise we ignore the request.
+	
+	Also return a bool weather we've shown the dash or not.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: notify grab also when the screen is not grabbed but we got a NotifyWhileGrabbed event
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1251193
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range
+
[phone]  Jinkyu Yi  <[e-mail]>
+
+	Dash: Fix problem at checking blacklisted unicode range. Fixes: 1251193
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	added changelog for #1291461
+
[phone]  William Hua  <[e-mail]>
+
+	added proper support for modifier-only shortcuts on the lock screen
+
[phone]  William Hua  <[e-mail]>
+
+	Treat Meta modifier as Alt.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor revisions.
+
[phone]  William Hua  <[e-mail]>
+
+	Destroy accelerator controller between locks.
+
[phone]  William Hua  <[e-mail]>
+
+	Remove gotos.
+
[phone]  William Hua  <[e-mail]>
+
+	Make a separate controller just for accelerators.
+
[phone]  William Hua  <[e-mail]>
+
+	Rip everything out and start anew.
+
[phone]  William Hua  <[e-mail]>
+
+	Add proper support for modifier-only shortcuts on the lock screen.
+
[phone]  Marc Deslauriers  <[e-mail]>
+
+	debian/changelog: sync with distro
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu hasn't actually been shown
+	
+	In addition, if the menu is not visible after the first popup call, try to show a menu
+	without keyboard focus. This will make possible to see menus also when there's a key-grab
+	(although they will be without keyboard support).
+	
+	Finally, reset the menu state, if that failed.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenPanel: if a menu is opened, and the screen is not grabbed, give the grab back to the Shield.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: cleanup the menu popup code, avoid unnecessary calls to gtk_widget_is_visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: if the menu is not visible, try to show a menu without keyboard focus
+	
+	This will make possible to see menus also when there's a key-grab.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelService: emit an invalid EntryActivated signal if the menu has not actually been shown
+	
+	And also reset the menu state, if that failed
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+	
+	Also, make sure that the lockscreen views are treated as "always-on-front" windows by nux
+	(and this applies to both visibility and events).
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	TestSessionController: verify correctly the new Hide method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the primary shield as the always on front window when another basewindow hides
+	
+	That window might have set itself as the always on front window, so we should restore our role
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: set the dialog as the nux always on front view
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionController: delete the views when hidden, we don't need to keep them around
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: make sure we reset all the unity views before locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: also send the terminate action to Alt pressure on lock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle all the unity (and thus the Gnome) key bindings when locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: don't try to regrab again if we've been just requested to ungrab
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: wait for the next ungrab-event if we can't grab when panel is not active anymore
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: toggle activation of all the unity compiz actions when locking the screen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: set the blank window or the primary shield as the always-on-front window
+	
+	In this way nux won't draw anything above it, nor will pass events to the underneath windows
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140423-0ubuntu1
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args. Fixes: 1291362
+
[phone]  Chris Townsend  <[e-mail]>
+
+	When setting the STARTING quirk for Application Launcher icons, only do it for the monitor specified in the passed in args.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too. Fixes: 1308850
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Use prompt_lock_requested signal.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Close dash/hud/etc. on signal locked too.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140416-0ubuntu1
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate twice the same entry! Fixes: 1308572
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Minor change.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix ident.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not allow to activate two times the same entry!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+	
+	This makes unity to relocks if it was locked before crashing... Fixes: 1308572
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: Save lock file stamp in $XDG_RUNTIME_DIR, cleanup it on destroy
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetUserRuntimeDirectory to fetch $XDG_RUNTIME_DIR
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: save a locked.stamp file when locking/unlocking, to relock on startup
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DesktopUtilities: add GetCacheDirectory, to fetch and create an unity cache dir
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140414.1-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog. Fixes: 1281825, 1307524
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+	
+	This fixes, between the others, the unity force-quit dialog.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly. Fixes: 1288789
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Scale: Correctly detect the activation of a scale and set scale_just_activated_
+	to true properly.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Security issue: Gestures on the lock screen allow to peek inside running applications.
+	As with keyboard input, gestures should be blocked while the screen is locked. Fixes: 1303041, 1306973
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Stop hiding the launchers parent window for now as it breaks urgent icon wiggling and hint shadow.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Don't queue up drawing if the gestures are ignored.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make the lockscreen_controller accessible to other classes and don't allow 4 finger gestures in the lock screen.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Should not even try to show the switcher if the screen is locked.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Forgot a variable
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Also, don't hide the launcher window if expo or scale are active.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Really shouldn't hide the launcher window if the dash is open.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140411-0ubuntu1
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_. Fixes: 1306417
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Lockscreen: Give proper grabs to the shield before releasing blank_window_.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410.1-0ubuntu1
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound buttons and input source switching under lock screen. 
+
[phone]  William Hua  <[e-mail]>
+
+	Clean up.
+
[phone]  William Hua  <[e-mail]>
+
+	Fix merge errors.
+
[phone]  William Hua  <[e-mail]>
+
+	Minor changes.
+
[phone]  William Hua  <[e-mail]>
+
+	Merge trunk.
+
[phone]  William Hua  <[e-mail]>
+
+	Enable sound and input source shortcuts on lock screen.
+
[phone]  CI bot  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	It fixes the quicklist menu appearance. Fixes: 1298859
+
[phone]  Eleni Maria Stea  <[e-mail]>
+
+	fixed quicklist scaling
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	When we detect caps lock, or caps lock is pressed, render a warning icon to show its on. Fixes: 1291737
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Make sure we update the caps lock detector when we change primary sheilds
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Get rid of magic numbers, have to get the width of the cached
+	spin icon width, so we can place the warning icon in the right spot
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Check if caps is on each time we make a new Prompt, as it can change
+	when authenticating, and we need to know.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Detect if caps lock is on, and check if caps lock is pressed.
+	If so, then render a warning icon.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	If the dash has not been opened before, a 4 finger tap will result in a dash with no selected scope.
+	Instead, set up the window and view of the dash by sending DASH_ABOUT_TO_SHOW (same happens when hovering the mouse pointer over the BFB icon)
+	and open the home scope. Fixes: 1303468
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	UnityGestureTarget.cpp: Remove spaces
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	4 finger tap: Set up the dash window and its view, show the home scope afterwards.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Launcher: Show and hide the launcher window OnDragUpdate() to fix the gesture animations Fixes: 1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Only hide/unhide launcher window if autohide mode is on.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Actually, Hide/Un-Hide launcher window in OnDragUpdate.
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Un-hide launcher window when dragging out using 4 finger gesture: https://bugs.launchpad.net/unity/+bug/1303141
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Alt-Tab has always respected the alt-tab-bias-viewport setting, but the 3-finger gesture to switch between windows has not, even though it does the same thing.
+	They should behave the same way depending on the CCSM setting. Fixes: 1303060
+
[phone]  Alfred Neumayer  <[e-mail]>
+
+	Make 3 finger window switch gesture respect the alt-tab-bias-viewport setting by moving the check to SetUpAndShowSwitcher.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests. Fixes: 1297842
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Shortcuts: Listen and react to view close requests.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge, PanelMenuView: perform proper WM action on clicks, based on user settings Fixes: 1283849
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use generic actions based on WM settings for double,middle and right clicks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add methods to {Horizontally,Vertically}Maximize a window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	WindowManager: add window shading methods
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: perform proper WM action on clicks, based on user settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add WindowManagerAction to get WM click options
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~3v1n0/unity/right-left-click-maximize-fix
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140410-0ubuntu1
+
[phone]  CI bot  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen. Fixes: 1292154
+
[phone]  CI bot  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+	
+	This allows to just use the fallback gnome-screensaver lockscreen if we need to use it. Fixes: 1303712
+
[phone]  CI bot  <[e-mail]>
+
+	GnomeSessionManager: impelement gnome session dbus interface and a fader to blank the screen Fixes: 1291088, 1292041, 1292078, 1292446, 1292451
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreen: add ability to show without fading in on some system calls
+	
+	Also, if locking is not enabled, calling Lock causes the screensaver to be initiated.
+	Many cleanups and misc fixes. Fixes: 1292575, 1305194
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: fire screensaver_post_lock_timeout_ when the view is fully visible
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: if it's impossible to lock a session, start the screensaver on lock
+	
+	This is what most of apps expect, and thus we do that. Although it's not really that coherent.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add ScreenSaver{Activate,Deactivate} and relevant signals and export them
+	
+	Update LockScreenController and dbus apis to match this
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: remove some racy code, avoid to emit multiple signals
+	
+	And fix pre-lock blank window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: increase the lockscreen timeout wait to be bigger to a frame duration
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: export PromptLock method on the dbus
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	BackgroundSettings: don't create new panel style instances, use the actual instance
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: get rid of the old active_ bool variable, that caused undefined behavior
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: even more cleanup, move blank window grabbing to own function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: we need to paint also the decorations of the windows, when in lock-mode
+	
+	Othewise their texture won't be rebuilt and this will lead to wrong textures.
+	Also, we don't need to damage the screen when lock opacity changes as it's done by nux.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: also hide BlankWindow on mouse and keyboard down events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: show a blank window unless we don't have the lockscreen ready on prompt requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionDBusManager: add support for "PromptLock"
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use prompt lockscreen on logind lock requests
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add support to PromptLockScreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SessionManager: add PromptLockScreen method and signal, to require a fast lock (with no fading)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~sjakthol/unity/fix-1292154
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Don't cache the value and watch for changes. Check the setting every time instead.
+
[phone]  Sami Jaktholm  <[e-mail]>
+
+	Session: Don't lock the screen if screen locking is disabled by
+	org.gnome.desktop.lockdown disable-lock-screen.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: make sure whe hide the blank window on unlock
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with lp:~laney/unity/g-s-replace
+	
+	Remves the ugly killall
+
[phone]  Iain Lane  <[e-mail]>
+
+	Take over as the owner of the gnome-screensaver interface, if necessary.
+
[phone]  Iain Lane  <[e-mail]>
+
+	Allow skipping of the tests with DEB_BUILD_OPTIONS=nocheck
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: add ShowBlankWindow method
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityShell: ops, remove wrong change
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: start the screensaver after few seconds that the user has locked his session, if there's no more interaction
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenShield: emit a signal when we receive a keyboard input
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: immediately start the screensaver on SetActive dbus call
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add request_activate signal that is emitted on remote activation request
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: some cleanup, and HideBlankWindow on simulate user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: keep track of dbus_manager and reset screensaver on simulate-user activity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: implement SimulateUserActivity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use a nux property for active state
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: don't animate when locking the screen on suspend or screensaver
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: we can lock the screen if the GS setting is disabled
+	
+	Also rename the setting to be more understandable
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merging with parent branch
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: always call LockScreen of SessionManager as it has some checks
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: damage the screen when the lockscreen opacity changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use a ROProperty for opacity
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only try to lock if locking is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use timeout seconds for lock delay
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: only use one window to blank the screen, it's not needed to have one per monitor
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: move OnPresenceStatusChanged into a function
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: lock the screen on suspend if ubuntu is configured to do so
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Uscreen: emit suspending signal on PrepareForSleep
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: use direction to set the animation value
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ExternalGschema: add missing external settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: also use legacy lockscreen if screen reader is enabled
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: add some comments
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: use async calls
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenController: call gnome-screensaver to lock the screen if we use a legacy lockscreen
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ScreenSaverDBusManager: start/stop gnome-screensaver if we don't/do handle the locking
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LockScreenSettings: add use_fallback option, that is on if OSK is active
+	
+	This is to workaround on screen keyboard issues
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Add GS schemas to external list
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	GnomeSessionManager: use enum class PresenceStatus instead of magic numbers
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Merge trunk.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Remove magic numbers.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Do not implement SimulateUserActivity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Update tests.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Start cleaning lockscreen code.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Fix. Code style is still WIP.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Lock the screen after a delay.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Add the first settings.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Initial commit to implement g-s dbus interface in unity.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140404-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: add a new "sheet style" dialog that is shown when a window hangs
+	
+	Listen to compiz toolkit events and prompt a dialog that allows to force-quit an
+	hanging application. Fixes: 698031, 1299061, 1299080
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure that the dialog is not deletable by WM
+	
+	For this to be safe we need also to ignore the delete events
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	POTFILES: include DecorationsForceQuitDialog.cpp
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: let's do one line things!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: make sure we hide the dialog before we killed the parent window
+	
+	It must be hidden before than the parent, in case the window is not really killed,
+	it will be shown anyway later.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: avoid warnings on close, due to finalized close button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: emit close_request signal on close and "Wait" button
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add close_request signal and destroy window when it  gets called
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add missing call to UpdateForceQuitDialogPosition
+	
+	Maybe it was removed due to a shelved change...
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: implement actual window killing by using both XKillClient and kill -9
+	
+	Yeah, now
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use proper class names (mostly for theming)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: use themed button textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set the dialog pid/hostname to match the ones of the parent window
+	
+	In this way we don't confuse BAMF about the ownership of the dialog.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: use the same window class of the real parent window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: keep the dialog centered on parent window when its geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsManager.cpp: show a forcequit dialog when we get a toolkitActionForceQuitDialog ClientMessage
+	
+	These events are triggered directly by compiz, so we only have to catch them!
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecoratedWindow: add ShowForceQuitDialog method to show a forcequit dialog on given window
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set dialog X time to match the one of the close event
+	
+	In this way we correctly handle the focus-stealing prevention
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: set shape area to ignore input events outside the actual dialog
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: set parent window as its actual parent X-side, and center on it
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ForceQuitDialog: fix label strings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Merge with trunk
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: obey to style for shadows
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsForceQuitDialog: add first basic gtk implementation of the force-quit dialog
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview. This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen. Fixes: 1104236
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue where windows that are in Show Desktop mode are selected for spread have a blank preview.  This fix will Fade Out the window for Spread and Fade In the window again when Spread exits if that window is not chosen.
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140403-0ubuntu1
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click Fixes: 1301459
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsGrabEdge: Only perform tookit actions on right-click
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have a valid screen ptr Fixes: 1291243
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: reset decoration::DataPool on destruction, otherwise we won't have screen ptr valid
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsDataPool: add static Reset method that allows to reset our textures
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes Fixes: 1024101
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ApplicationLauncherIcon: recompute pips when the screen geometry changes
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented Fixes: 1301394
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Launcher: hide the launcher window when in auto-hide mode if it's not presented
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator from services/panel-service.c 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	remove libsyncindicator.so (lp: #1300916)
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916) Fixes: 1300916
+
[phone]  Dimitri John Ledkov  <[e-mail]>
+
+	Drop U1 default shortcuts & indicator-sync recommendation. (LP: #1300916)
+
[phone]  CI bot  <[e-mail]>
+
+	Releasing 7.2.0+14.04.20140402-0ubuntu1
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	bump to release 7.2.0 
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control: fix some style warnings in package description
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/changelog: fix syntax to silence a lintian warning
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	debian/control(Standards-Version): bump to 3.9.5 (no changes)
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+	release 7.2.0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use launcher width, scale on HiDPI, match also application names
+	
+	Launcher Width is now considered in setting the offset of the scale filter (fixes
+	padding when launcher is in autohide mode).
+	The search bar is correctly scaled when in HiDPI mode.
+	We use ApplicationManager and thus BAMF to match windows by their name or app name. Fixes: 1281297, 1282001, 1300763, 1300842
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: use casefold instead that tolower as it's meant for equalty checks as we do here
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: implement our own to_lower_copy that works with utf8
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityScreen: match the scaled windows based on the SpreadFilter matches
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: compute a list of filtered windows using both window and application name
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter: take in consideration the launcher width when setting the spread offset
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SpreadFilter :Scale the internal searchbar to match DPI settings
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	SearchBar: fix crash when trying to update the show filter scale in a filterless-search bar
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title Fixes: 1296866
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: add "panel-title" class to the panel style context when drawing title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelStyle: return a Style context with different widget path in GetStyleContext based on type
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: use panel style context for painting the panel title
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: allow to use a different style context in DrawTitle
+	
+	Panel will need to use a different one
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Panel, Decorations: draw the background under the text glyphs before the text itself Fixes: 723167
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnitySettings: never allow values minor or equal to 0 as UI scale
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsMenuEntry: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationsTitle: draw background under text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: draw text glyphs background on menu items
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelMenuView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	DecorationStyle: add support for drawing the text background under the glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	PanelIndicatorEntryView: draw the background under the text glyphs
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration. Fixes: 1281825
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	CompizUtils: only shadow-decorate alpha windows that have full decorations as well
+	
+	Since alpha windows might have custom shapes, it's safer not to shadow-decorate them
+	unless they don't provide, for sure, a full decoration.
+
 2014-03-28  CI bot  <[e-mail]>
 
 	Releasing 7.1.2+14.04.20140328.1-0ubuntu1

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-03-21 05:23:42 +0000
+++ dash/DashController.cpp	2014-05-13 20:01:30 +0000
@@ -66,7 +66,6 @@
   , create_window_(create_window)
   , monitor_(0)
   , visible_(false)
-  , need_show_(false)
   , dbus_server_(dbus::BUS_NAME)
   , ensure_timeout_(PRELOAD_TIMEOUT_LENGTH)
   , timeline_animator_(90)
@@ -262,20 +261,14 @@
   HideDash();
 }
 
-void Controller::OnScreenUngrabbed()
+void Controller::OnExternalShowDash(GVariant* variant)
 {
-  LOG_DEBUG(logger) << "On Screen Ungrabbed called";
-  if (need_show_)
-  {
-    EnsureDash();
+  EnsureDash();
+
+  if (!visible_)
     ShowDash();
-  }
-}
-
-void Controller::OnExternalShowDash(GVariant* variant)
-{
-  EnsureDash();
-  visible_ ? HideDash() : ShowDash();
+  else
+    HideDash();
 }
 
 void Controller::OnExternalHideDash(GVariant* variant)
@@ -283,31 +276,44 @@
   HideDash();
 }
 
-void Controller::ShowDash()
+bool Controller::ShowDash()
 {
-  EnsureDash();
+  // Don't want to show at the wrong time
+  if (visible_)
+    return false;
+
   WindowManager& wm = WindowManager::Default();
-  // Don't want to show at the wrong time
-  if (visible_ || wm.IsExpoActive() || wm.IsScaleActive())
-    return;
+
+  if (wm.IsExpoActive())
+    wm.TerminateExpo();
 
   // We often need to wait for the mouse/keyboard to be available while a plugin
   // is finishing it's animations/cleaning up. In these cases, we patiently wait
   // for the screen to be available again before honouring the request.
   if (wm.IsScreenGrabbed())
   {
-    screen_ungrabbed_slot_ = wm.screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed));
-    need_show_ = true;
-    return;
+    screen_ungrabbed_slot_ = wm.screen_ungrabbed.connect([this] {
+      grab_wait_.reset();
+      ShowDash();
+    });
+
+    // Let's wait ungrab event for maximum a couple of seconds...
+    grab_wait_.reset(new glib::TimeoutSeconds(2, [this] {
+      screen_ungrabbed_slot_->disconnect();
+      return false;
+    }));
+
+    return false;
   }
 
+  EnsureDash();
   monitor_ = GetIdealMonitor();
+  screen_ungrabbed_slot_->disconnect();
   int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_);
   view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_));
   view_->AboutToShow(monitor_);
   FocusWindow();
 
-  need_show_ = false;
   visible_ = true;
 
   StartShowHideTimeline();
@@ -316,6 +322,7 @@
 
   GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_, view_content_geo.width, view_content_geo.height);
   ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
+  return true;
 }
 
 void Controller::FocusWindow()
@@ -347,8 +354,6 @@
   if (!visible_)
    return;
 
-  screen_ungrabbed_slot_->disconnect();
-
   EnsureDash();
 
   view_->AboutToHide();
@@ -394,7 +399,7 @@
   view_->OnActivateRequest(variant);
 }
 
-gboolean Controller::CheckShortcutActivation(const char* key_string)
+bool Controller::CheckShortcutActivation(const char* key_string)
 {
   if (!key_string)
     return false;

=== modified file 'dash/DashController.h'
--- dash/DashController.h	2014-03-21 05:23:42 +0000
+++ dash/DashController.h	2014-05-13 20:01:30 +0000
@@ -51,7 +51,7 @@
 
   nux::BaseWindow* window() const;
 
-  gboolean CheckShortcutActivation(const char* key_string);
+  bool CheckShortcutActivation(const char* key_string);
   std::vector<char> GetAllShortcuts();
 
   nux::Property<bool> use_primary;
@@ -60,7 +60,7 @@
 
   void HideDash();
   void QuicklyHideDash();
-  void ShowDash();
+  bool ShowDash();
 
   void ReFocusKeyInput();
 
@@ -86,7 +86,6 @@
   void Relayout(bool check_monitor =false);
 
   void OnMouseDownOutsideWindow(int x, int y, unsigned long bflags, unsigned long kflags);
-  void OnScreenUngrabbed();
   void OnExternalShowDash(GVariant* variant);
   void OnExternalHideDash(GVariant* variant);
   void OnActivateRequest(GVariant* variant);
@@ -103,14 +102,13 @@
   nux::ObjectPtr<ResizingBaseWindow> window_;
   nux::ObjectPtr<DashView> view_;
   int monitor_;
-
   bool visible_;
-  bool need_show_;
 
   connection::Wrapper screen_ungrabbed_slot_;
   connection::Wrapper form_factor_changed_;
   glib::DBusServer dbus_server_;
   glib::TimeoutSeconds ensure_timeout_;
+  glib::Source::UniquePtr grab_wait_;
   nux::animation::AnimateValue<double> timeline_animator_;
   UBusManager ubus_manager_;
 };

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-03-21 23:08:47 +0000
+++ dash/DashView.cpp	2014-05-13 20:01:30 +0000
@@ -1457,8 +1457,8 @@
   {
     for (Scope::Ptr scope: scopes_->GetScopes())
     {
-      std::string shortcut = scope->shortcut;
-      if(shortcut.size() > 0)
+      std::string const& shortcut = scope->shortcut;
+      if (!shortcut.empty())
         result.push_back(shortcut.at(0));
     }
   }

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2014-03-20 05:05:21 +0000
+++ dash/ResultRendererTile.cpp	2014-05-13 20:01:30 +0000
@@ -424,7 +424,7 @@
 bool IsBlacklistedChar(gunichar uni_c)
 {
   if ((uni_c >= 0x1000 && uni_c <= 0x109F) ||
-      (uni_c >= 0xAA60 && uni_c >= 0xAA7B))
+      (uni_c >= 0xAA60 && uni_c <= 0xAA7B))
   {
     return true;
   }

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-02 14:46:24 +0000
+++ debian/changelog	2014-05-13 20:01:30 +0000
@@ -1,3 +1,44 @@
+unity (7.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Brandon Schaefer ]
+  * Set the max width, so our static text wraps. So we don't end up
+    rendering text out of the view area. (LP: #1312749)
+
+  [ Jnkyu Yi ]
+  * fixed range of blacklisted Unicode characters (lp: #1251193)
+
+  [ Marco Trevisan (Treviño) ]
+  * UnityScreen: toggle activation of all the unity compiz actions when
+    locking the screen Also, make sure that the lockscreen views are
+    treated as "always-on-front" windows by nux (and this applies to
+    both visibility and events).
+  * PanelService: emit an invalid EntryActivated signal if the menu
+    hasn't actually been shown In addition, if the menu is not visible
+    after the first popup call, try to show a menu without keyboard
+    focus. This will make possible to see menus also when there's a key-
+    grab (although they will be without keyboard support). Finally,
+    reset the menu state, if that failed.
+  * UnityScreen: always paint the lockscreen above, just add menu and
+    onboard as exceptions Some code cleanup, factorizing similar code.
+    (LP: #1313280)
+  * PluginAdapter: make sure we don't try to call an invalid
+    initiate/terminate callback function (LP: #1221673)
+  * DebugDBusInterface: match properties if they are in the AP array
+    form [<type>, <value>] (LP: #1307748)
+
+  [ Stephen M. Webb ]
+  * lockscreen/LockScreenAccelerators.h: added required header for
+    std:vector definition (fixes FTBFS in Ubuntu)
+  * disabled precompiled headers on arm64 Ubuntu package builds
+    (lp: #1317276)
+  * bump upstream release to 7.2.1
+
+  [ William Hua ]
+  * added proper support for modifier-only shortcuts on the lock screen
+    (lp: #1291461)
+
+ -- Stephen M. Webb <[e-mail]>  Tue, 13 May 2014 13:15:21 -0400
+
 unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
 
   * SECURITY UPDATE: more lock screen bypass issues, and regression with

=== modified file 'debian/rules'
--- debian/rules	2014-04-09 12:38:25 +0000
+++ debian/rules	2014-05-13 20:01:30 +0000
@@ -23,13 +23,17 @@
 
 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
 
+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
+  cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
+endif
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
+  cmake_pch_options := -Duse_pch=OFF
+endif
+
 
 override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
-else
-	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
-endif
+	dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
 
 override_dh_install:
 	# install autopilot tests

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2014-03-20 00:11:08 +0000
+++ launcher/LauncherController.cpp	2014-05-13 20:01:30 +0000
@@ -1199,18 +1199,6 @@
 void Controller::HandleLauncherKeyRelease(bool was_tap, int when)
 {
   int tap_duration = when - pimpl->launcher_key_press_time_;
-  WindowManager& wm = WindowManager::Default();
-
-  if (tap_duration < options()->super_tap_duration && was_tap &&
-      !wm.IsTopWindowFullscreenOnMonitorWithMouse())
-  {
-    LOG_DEBUG(logger) << "Quick tap, sending activation request.";
-    pimpl->SendHomeActivationRequest();
-  }
-  else
-  {
-    LOG_DEBUG(logger) << "Tap too long: " << tap_duration;
-  }
 
   pimpl->sources_.Remove(local::LABELS_TIMEOUT);
   pimpl->sources_.Remove(local::KEYPRESS_TIMEOUT);

=== modified file 'lockscreen/CMakeLists.txt'
--- lockscreen/CMakeLists.txt	2014-04-02 13:40:28 +0000
+++ lockscreen/CMakeLists.txt	2014-05-13 20:01:30 +0000
@@ -24,6 +24,8 @@
      LockScreenShield.cpp
      LockScreenShieldFactory.cpp
      LockScreenPanel.cpp
+     LockScreenAcceleratorController.cpp
+     LockScreenAccelerators.cpp
      ScreenSaverDBusManager.cpp
      UserAuthenticatorPam.cpp
      UserPromptView.cpp

=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	2014-04-10 17:43:13 +0000
+++ lockscreen/LockScreenAbstractShield.h	2014-05-13 20:01:30 +0000
@@ -25,6 +25,7 @@
 #include <UnityCore/Indicators.h>
 
 #include "unity-shared/MockableBaseWindow.h"
+#include "LockScreenAccelerators.h"
 
 namespace unity
 {
@@ -34,12 +35,13 @@
 class AbstractShield : public MockableBaseWindow
 {
 public:
-  AbstractShield(session::Manager::Ptr const& session, indicator::Indicators::Ptr const& indicators, int monitor_num, bool is_primary)
+  AbstractShield(session::Manager::Ptr const& session, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)
     : MockableBaseWindow("Unity Lockscreen")
     , primary(is_primary)
     , monitor(monitor_num)
     , session_manager_(session)
     , indicators_(indicators)
+    , accelerators_(accelerators)
   {}
 
   nux::Property<bool> primary;
@@ -48,6 +50,7 @@
   using MockableBaseWindow::RemoveLayout;
   virtual bool IsIndicatorOpen() const = 0;
   virtual void CheckCapsLockPrompt() = 0;
+  virtual void ActivatePanel() = 0;
 
   sigc::signal<void, int, int> grab_motion;
   sigc::signal<void, unsigned long, unsigned long> grab_key;
@@ -55,6 +58,7 @@
 protected:
   session::Manager::Ptr session_manager_;
   indicator::Indicators::Ptr indicators_;
+  Accelerators::Ptr accelerators_;
 };
 
 } // lockscreen

=== added file 'lockscreen/LockScreenAcceleratorController.cpp'
--- lockscreen/LockScreenAcceleratorController.cpp	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenAcceleratorController.cpp	2014-05-13 20:01:30 +0000
@@ -0,0 +1,146 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: William Hua <[e-mail]>
+ */
+
+#include "LockScreenAcceleratorController.h"
+
+#include <UnityCore/GLibDBusProxy.h>
+
+namespace unity
+{
+namespace lockscreen
+{
+
+namespace
+{
+const char* const MEDIA_KEYS_SCHEMA                = "org.gnome.settings-daemon.plugins.media-keys";
+const char* const MEDIA_KEYS_KEY_VOLUME_MUTE       = "volume-mute";
+const char* const MEDIA_KEYS_KEY_VOLUME_DOWN       = "volume-down";
+const char* const MEDIA_KEYS_KEY_VOLUME_UP         = "volume-up";
+const char* const INPUT_SWITCH_SCHEMA              = "org.gnome.desktop.wm.keybindings";
+const char* const INPUT_SWITCH_KEY_PREVIOUS_SOURCE = "switch-input-source-backward";
+const char* const INPUT_SWITCH_KEY_NEXT_SOURCE     = "switch-input-source";
+
+const char* const INDICATOR_INTERFACE_ACTIONS      = "org.gtk.Actions";
+const char* const INDICATOR_METHOD_ACTIVATE        = "Activate";
+const char* const INDICATOR_SOUND_BUS_NAME         = "com.canonical.indicator.sound";
+const char* const INDICATOR_SOUND_OBJECT_PATH      = "/com/canonical/indicator/sound";
+const char* const INDICATOR_SOUND_ACTION_MUTE      = "mute";
+const char* const INDICATOR_SOUND_ACTION_SCROLL    = "scroll";
+const char* const INDICATOR_KEYBOARD_BUS_NAME      = "com.canonical.indicator.keyboard";
+const char* const INDICATOR_KEYBOARD_OBJECT_PATH   = "/com/canonical/indicator/keyboard";
+const char* const INDICATOR_KEYBOARD_ACTION_SCROLL = "locked_scroll";
+
+void ActivateIndicator(std::string const& bus_name,
+                       std::string const& object_path,
+                       std::string const& action_name,
+                       glib::Variant const& parameters = glib::Variant())
+{
+  GVariantBuilder builder;
+
+  g_variant_builder_init(&builder, G_VARIANT_TYPE("(sava{sv})"));
+  g_variant_builder_add(&builder, "s", action_name.c_str());
+
+  if (parameters)
+    g_variant_builder_add_parsed(&builder, "[%v]", static_cast<GVariant*>(parameters));
+  else
+    g_variant_builder_add_parsed(&builder, "@av []");
+
+  g_variant_builder_add_parsed(&builder, "@a{sv} []");
+
+  auto proxy = std::make_shared<glib::DBusProxy>(bus_name, object_path, INDICATOR_INTERFACE_ACTIONS);
+  proxy->CallBegin(INDICATOR_METHOD_ACTIVATE, g_variant_builder_end(&builder), [proxy] (GVariant*, glib::Error const&) {});
+}
+
+void MuteIndicatorSound()
+{
+  ActivateIndicator(INDICATOR_SOUND_BUS_NAME,
+                    INDICATOR_SOUND_OBJECT_PATH,
+                    INDICATOR_SOUND_ACTION_MUTE);
+}
+
+void ScrollIndicatorSound(int offset)
+{
+  ActivateIndicator(INDICATOR_SOUND_BUS_NAME,
+                    INDICATOR_SOUND_OBJECT_PATH,
+                    INDICATOR_SOUND_ACTION_SCROLL,
+                    g_variant_new_int32(offset));
+}
+
+void ScrollIndicatorKeyboard(int offset)
+{
+  ActivateIndicator(INDICATOR_KEYBOARD_BUS_NAME,
+                    INDICATOR_KEYBOARD_OBJECT_PATH,
+                    INDICATOR_KEYBOARD_ACTION_SCROLL,
+                    g_variant_new_int32(-offset));
+}
+} // namespace
+
+AcceleratorController::AcceleratorController()
+  : accelerators_(new Accelerators)
+{
+  auto settings = glib::Object<GSettings>(g_settings_new(MEDIA_KEYS_SCHEMA));
+
+  auto accelerator = std::make_shared<Accelerator>(glib::String(g_settings_get_string(settings, MEDIA_KEYS_KEY_VOLUME_MUTE)));
+  accelerator->activated.connect(std::function<void ()>(MuteIndicatorSound));
+  accelerators_->Add(accelerator);
+
+  accelerator = std::make_shared<Accelerator>(glib::String(g_settings_get_string(settings, MEDIA_KEYS_KEY_VOLUME_DOWN)));
+  accelerator->activated.connect(std::bind(ScrollIndicatorSound, -1));
+  accelerators_->Add(accelerator);
+
+  accelerator = std::make_shared<Accelerator>(glib::String(g_settings_get_string(settings, MEDIA_KEYS_KEY_VOLUME_UP)));
+  accelerator->activated.connect(std::bind(ScrollIndicatorSound, +1));
+  accelerators_->Add(accelerator);
+
+  settings = glib::Object<GSettings>(g_settings_new(INPUT_SWITCH_SCHEMA));
+
+  auto variant = glib::Variant(g_settings_get_value(settings, INPUT_SWITCH_KEY_PREVIOUS_SOURCE), glib::StealRef());
+
+  if (g_variant_n_children(variant) > 0)
+  {
+    const gchar* string;
+
+    g_variant_get_child(variant, 0, "&s", &string);
+
+    accelerator = std::make_shared<Accelerator>(string);
+    accelerator->activated.connect(std::bind(ScrollIndicatorKeyboard, -1));
+    accelerators_->Add(accelerator);
+  }
+
+  variant = glib::Variant(g_settings_get_value(settings, INPUT_SWITCH_KEY_NEXT_SOURCE), glib::StealRef());
+
+  if (g_variant_n_children(variant) > 0)
+  {
+    const gchar* string;
+
+    g_variant_get_child(variant, 0, "&s", &string);
+
+    accelerator = std::make_shared<Accelerator>(string);
+    accelerator->activated.connect(std::bind(ScrollIndicatorKeyboard, +1));
+    accelerators_->Add(accelerator);
+  }
+}
+
+Accelerators::Ptr const& AcceleratorController::GetAccelerators() const
+{
+  return accelerators_;
+}
+
+} // lockscreen namespace
+} // unity namespace

=== added file 'lockscreen/LockScreenAcceleratorController.h'
--- lockscreen/LockScreenAcceleratorController.h	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenAcceleratorController.h	2014-05-13 20:01:30 +0000
@@ -0,0 +1,46 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: William Hua <[e-mail]>
+ */
+
+#ifndef UNITY_LOCKSCREEN_ACCELERATOR_CONTROLLER
+#define UNITY_LOCKSCREEN_ACCELERATOR_CONTROLLER
+
+#include "LockScreenAccelerators.h"
+
+namespace unity
+{
+namespace lockscreen
+{
+
+class AcceleratorController
+{
+public:
+  typedef std::shared_ptr<AcceleratorController> Ptr;
+
+  AcceleratorController();
+
+  Accelerators::Ptr const& GetAccelerators() const;
+
+private:
+  Accelerators::Ptr accelerators_;
+};
+
+} // lockscreen namespace
+} // unity namespace
+
+#endif // UNITY_LOCKSCREEN_ACCELERATOR_CONTROLLER

=== added file 'lockscreen/LockScreenAccelerators.cpp'
--- lockscreen/LockScreenAccelerators.cpp	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenAccelerators.cpp	2014-05-13 20:01:30 +0000
@@ -0,0 +1,528 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: William Hua <[e-mail]>
+ */
+
+#include "LockScreenAccelerators.h"
+
+#include <NuxGraphics/Events.h>
+#include <gtk/gtk.h>
+
+namespace unity
+{
+namespace lockscreen
+{
+
+enum class PressedState : unsigned int
+{
+  NothingPressed      = 0x00,
+  LeftShiftPressed    = 0x01,
+  LeftControlPressed  = 0x02,
+  LeftAltPressed      = 0x04,
+  LeftSuperPressed    = 0x08,
+  RightShiftPressed   = 0x10,
+  RightControlPressed = 0x20,
+  RightAltPressed     = 0x40,
+  RightSuperPressed   = 0x80
+};
+
+PressedState operator~(PressedState const& first)
+{
+  return static_cast<PressedState>(~static_cast<unsigned int>(first));
+}
+
+PressedState operator&(PressedState const& first, PressedState const& second)
+{
+  return static_cast<PressedState>(static_cast<unsigned int>(first) & static_cast<unsigned int>(second));
+}
+
+PressedState operator|(PressedState const& first, PressedState const& second)
+{
+  return static_cast<PressedState>(static_cast<unsigned int>(first) | static_cast<unsigned int>(second));
+}
+
+PressedState& operator&=(PressedState& first, PressedState const& second)
+{
+  return first = first & second;
+}
+
+PressedState& operator|=(PressedState& first, PressedState const& second)
+{
+  return first = first | second;
+}
+
+namespace
+{
+unsigned int KeysymToModifier(unsigned int keysym)
+{
+  switch (keysym)
+  {
+  case GDK_KEY_Shift_L:
+  case GDK_KEY_Shift_R:
+    return nux::KEY_MODIFIER_SHIFT;
+  case GDK_KEY_Control_L:
+  case GDK_KEY_Control_R:
+    return nux::KEY_MODIFIER_CTRL;
+  case GDK_KEY_Meta_L:
+  case GDK_KEY_Meta_R:
+  case GDK_KEY_Alt_L:
+  case GDK_KEY_Alt_R:
+    return nux::KEY_MODIFIER_ALT;
+  case GDK_KEY_Super_L:
+  case GDK_KEY_Super_R:
+    return nux::KEY_MODIFIER_SUPER;
+  }
+
+  return 0;
+}
+
+PressedState KeysymToPressedState(unsigned int keysym)
+{
+  switch (keysym)
+  {
+  case GDK_KEY_Shift_L:
+    return PressedState::LeftShiftPressed;
+  case GDK_KEY_Shift_R:
+    return PressedState::RightShiftPressed;
+  case GDK_KEY_Control_L:
+    return PressedState::LeftControlPressed;
+  case GDK_KEY_Control_R:
+    return PressedState::RightControlPressed;
+  case GDK_KEY_Meta_L:
+  case GDK_KEY_Alt_L:
+    return PressedState::LeftAltPressed;
+  case GDK_KEY_Meta_R:
+  case GDK_KEY_Alt_R:
+    return PressedState::RightAltPressed;
+  case GDK_KEY_Super_L:
+    return PressedState::LeftSuperPressed;
+  case GDK_KEY_Super_R:
+    return PressedState::RightSuperPressed;
+  }
+
+  return PressedState::NothingPressed;
+}
+
+unsigned int KeysymToMirrorKeysym(unsigned int keysym)
+{
+  switch (keysym)
+  {
+  case GDK_KEY_Shift_L:
+    return GDK_KEY_Shift_R;
+  case GDK_KEY_Shift_R:
+    return GDK_KEY_Shift_L;
+  case GDK_KEY_Control_L:
+    return GDK_KEY_Control_R;
+  case GDK_KEY_Control_R:
+    return GDK_KEY_Control_L;
+  case GDK_KEY_Meta_L:
+    return GDK_KEY_Meta_R;
+  case GDK_KEY_Meta_R:
+    return GDK_KEY_Meta_L;
+  case GDK_KEY_Alt_L:
+    return GDK_KEY_Alt_R;
+  case GDK_KEY_Alt_R:
+    return GDK_KEY_Alt_L;
+  case GDK_KEY_Super_L:
+    return GDK_KEY_Super_R;
+  case GDK_KEY_Super_R:
+    return GDK_KEY_Super_L;
+  }
+
+  return 0;
+}
+} // namespace
+
+Accelerator::Accelerator(unsigned int keysym,
+                         unsigned int keycode,
+                         unsigned int modifiers)
+  : keysym_(keysym)
+  , keycode_(keycode)
+  , modifiers_(modifiers)
+  , active_(true)
+  , activated_(false)
+{
+}
+
+Accelerator::Accelerator(std::string const& string)
+  : keysym_(0)
+  , keycode_(0)
+  , modifiers_(0)
+  , active_(true)
+  , activated_(false)
+{
+  guint keysym;
+  guint* keycodes;
+  GdkModifierType modifiers;
+
+  gtk_accelerator_parse_with_keycode(string.c_str(), &keysym, &keycodes, &modifiers);
+
+  /* gtk_accelerator_parse_with_keycode() might fail if the key is not in the
+   * default key map. gtk_accelerator_parse() might succeed in this case. */
+  if (keysym == 0 && keycodes == NULL && modifiers == 0)
+    gtk_accelerator_parse(string.c_str(), &keysym, &modifiers);
+
+  keysym_ = keysym;
+
+  if (keycodes != NULL)
+  {
+    keycode_ = keycodes[0];
+    g_free(keycodes);
+  }
+
+  if (modifiers & GDK_SHIFT_MASK)
+    modifiers_ |= nux::KEY_MODIFIER_SHIFT;
+  if (modifiers & GDK_CONTROL_MASK)
+    modifiers_ |= nux::KEY_MODIFIER_CTRL;
+  if ((modifiers & GDK_MOD1_MASK) || (modifiers & GDK_META_MASK))
+    modifiers_ |= nux::KEY_MODIFIER_ALT;
+  if (modifiers & GDK_SUPER_MASK)
+    modifiers_ |= nux::KEY_MODIFIER_SUPER;
+}
+
+bool Accelerator::operator==(Accelerator const& accelerator) const
+{
+  return keysym_    == accelerator.keysym_
+      && keycode_   == accelerator.keycode_
+      && modifiers_ == accelerator.modifiers_;
+}
+
+bool Accelerator::KeyPressActivate()
+{
+  activated.emit();
+  activated_ = true;
+
+  return true;
+}
+
+bool Accelerator::KeyReleaseActivate()
+{
+  activated.emit();
+  activated_ = false;
+
+  return true;
+}
+
+bool Accelerator::HandleKeyPress(unsigned int keysym,
+                                 unsigned int modifiers,
+                                 PressedState pressed_state)
+{
+  auto is_modifier_only = keysym_ == 0 && keycode_ == 0 && modifiers_ != 0;
+  auto is_modifier_keysym = KeysymToModifier(keysym_);
+  auto modifier = KeysymToModifier(keysym);
+
+  if (modifiers == 0)
+  {
+    /* We're pressing a key when no other key is pressed. We can reset this
+     * accelerator back to its original enabled state. */
+    active_ = true;
+    activated_ = false;
+  }
+
+  if (!active_)
+    return false;
+
+  /* We need to cancel modifier-only accelerators in some cases. For example,
+   * we should cancel a Ctrl+Alt accelerator if Ctrl+Alt+T is pressed. */
+  if (is_modifier_only || is_modifier_keysym)
+  {
+    if (!modifier)
+    {
+      /* We pressed a non-modifier key for a modifier-only accelerator. */
+      active_ = false;
+      return false;
+    }
+    else if (keysym != keysym_ && (modifiers_ & modifier) == 0)
+    {
+      /* We pressed a modifier key that isn't the keysym and isn't one of the
+       * modifiers. */
+      active_ = false;
+      return false;
+    }
+  }
+  else if (!modifier)
+  {
+    /* We expect a non-modifier key to activate and one was pressed. */
+    if (modifiers == modifiers_)
+    {
+      /* The modifiers match. Check if the keysyms match. */
+      if (keysym == keysym_)
+        return KeyPressActivate();
+      else
+      {
+        /* Otherwise, check if the keycodes match. Maybe the accelerator
+         * specifies a particular key code, or the keyboard layout changed. For
+         * example, if the accelerator is Ctrl+A and the user switches from a
+         * QWERTY to an AZERTY layout, we should accept Ctrl+Q so the user can
+         * cycle through the entire list of keyboard layouts. */
+
+        GdkKeymapKey* key;
+        gint keys;
+
+        if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keysym, &key, &keys))
+        {
+          for (auto i = 0; i < keys; i++)
+          {
+            if (key[i].keycode == keycode_)
+            {
+              g_free(key);
+
+              return KeyPressActivate();
+            }
+          }
+
+          g_free(key);
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+bool Accelerator::HandleKeyRelease(unsigned int keysym,
+                                   unsigned int modifiers,
+                                   PressedState pressed_state)
+{
+  auto is_modifier_only = keysym_ == 0 && keycode_ == 0 && modifiers_ != 0;
+  auto is_modifier_keysym = KeysymToModifier(keysym_);
+  auto modifier = KeysymToModifier(keysym);
+
+  /* Don't activate on key release if we were activated on a key press. */
+  if (!active_ || activated_)
+    return false;
+
+  /* Check if the keysyms match. */
+  if (keysym == keysym_)
+  {
+    if (KeysymToModifier(keysym) == 0)
+    {
+      /* We released a non-modifier key. */
+      if (modifiers == modifiers_)
+        return KeyReleaseActivate();
+    }
+    else
+    {
+      /* We released a modifier key. */
+      auto mirror_keysym = KeysymToMirrorKeysym(keysym);
+      auto is_mirror_pressed = (pressed_state & KeysymToPressedState(mirror_keysym)) != PressedState::NothingPressed;
+
+      /* Ctrl+Shift_R is different from Ctrl+Shift+Shift_R, so we must detect
+       * if the mirror key was pressed or not. */
+      if (is_mirror_pressed)
+      {
+        /* The mirrored modifier is pressed. */
+        if (modifiers == modifiers_)
+          return KeyReleaseActivate();
+      }
+      else
+      {
+        /* The mirrored modifier wasn't pressed. Compare modifiers without it. */
+        if ((modifiers & ~KeysymToModifier(mirror_keysym)) == modifiers_)
+          return KeyReleaseActivate();
+      }
+    }
+  }
+
+  if (is_modifier_only || is_modifier_keysym)
+  {
+    if (modifier)
+    {
+      /* We released a modifier key for a modifier-only accelerator. */
+
+      if (is_modifier_only)
+      {
+        /* The accelerator has no keysym or keycode. */
+
+        /* TODO: Normally we would activate here, but compiz is intercepting
+         * this case and handling it. This is bad because now we can't do
+         * anything here. Otherwise we'll do the same action twice. */
+        if (modifiers == modifiers_)
+          return false;
+      }
+      else
+      {
+        /* The accelerator has a modifier keysym. */
+        auto is_keysym_pressed = (pressed_state & KeysymToPressedState(keysym_)) != PressedState::NothingPressed;
+
+        if (is_keysym_pressed)
+        {
+          auto mirror_keysym = KeysymToMirrorKeysym(keysym_);
+          auto is_mirror_pressed = (pressed_state & KeysymToPressedState(mirror_keysym)) != PressedState::NothingPressed;
+
+          /* Ctrl+Shift_R is different from Ctrl+Shift+Shift_R, so we must detect
+           * if the mirror key was pressed or not. */
+          if (is_mirror_pressed)
+          {
+            /* The mirrored modifier is pressed. */
+            if (modifiers == modifiers_)
+              return KeyReleaseActivate();
+          }
+          else
+          {
+            /* The mirrored modifier wasn't pressed. Compare modifiers without it. */
+            if ((modifiers & ~KeysymToModifier(mirror_keysym)) == modifiers_)
+              return KeyReleaseActivate();
+          }
+        }
+      }
+    }
+  }
+  else if (keycode_ != 0 && modifiers == modifiers_)
+  {
+    /* Otherwise, check if the keycodes match. Maybe the accelerator
+     * specifies a particular key code, or the keyboard layout changed. For
+     * example, if the accelerator is Ctrl+A and the user switches from a
+     * QWERTY to an AZERTY layout, we should accept Ctrl+Q so the user can
+     * cycle through the entire list of keyboard layouts. */
+
+    GdkKeymapKey* key;
+    gint keys;
+
+    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keysym, &key, &keys))
+    {
+      for (auto i = 0; i < keys; i++)
+      {
+        if (key[i].keycode == keycode_)
+        {
+          g_free(key);
+
+          return KeyReleaseActivate();
+        }
+      }
+
+      g_free(key);
+    }
+  }
+
+  return false;
+}
+
+Accelerators::Accelerators()
+  : pressed_state_(PressedState::NothingPressed)
+{
+}
+
+void Accelerators::Clear()
+{
+  accelerators_.clear();
+}
+
+void Accelerators::Add(Accelerator::Ptr const& accelerator)
+{
+  accelerators_.push_back(accelerator);
+}
+
+void Accelerators::Remove(Accelerator::Ptr const& accelerator)
+{
+  accelerators_.erase(std::remove(accelerators_.begin(), accelerators_.end(), accelerator), accelerators_.end());
+}
+
+bool Accelerators::HandleKeyPress(unsigned int keysym,
+                                  unsigned int modifiers)
+{
+  modifiers &= nux::KEY_MODIFIER_SHIFT
+             | nux::KEY_MODIFIER_CTRL
+             | nux::KEY_MODIFIER_ALT
+             | nux::KEY_MODIFIER_SUPER;
+
+  switch (keysym)
+  {
+  case GDK_KEY_Shift_L:
+    pressed_state_ |= PressedState::LeftShiftPressed;
+    break;
+  case GDK_KEY_Shift_R:
+    pressed_state_ |= PressedState::RightShiftPressed;
+    break;
+  case GDK_KEY_Control_L:
+    pressed_state_ |= PressedState::LeftControlPressed;
+    break;
+  case GDK_KEY_Control_R:
+    pressed_state_ |= PressedState::RightControlPressed;
+    break;
+  case GDK_KEY_Meta_L:
+  case GDK_KEY_Alt_L:
+    pressed_state_ |= PressedState::LeftAltPressed;
+    break;
+  case GDK_KEY_Meta_R:
+  case GDK_KEY_Alt_R:
+    pressed_state_ |= PressedState::RightAltPressed;
+    break;
+  case GDK_KEY_Super_L:
+    pressed_state_ |= PressedState::LeftSuperPressed;
+    break;
+  case GDK_KEY_Super_R:
+    pressed_state_ |= PressedState::RightSuperPressed;
+    break;
+  }
+
+  auto handled = false;
+
+  for (auto& accelerator : accelerators_)
+    handled = accelerator->HandleKeyPress(keysym, modifiers, pressed_state_) || handled;
+
+  return handled;
+}
+
+bool Accelerators::HandleKeyRelease(unsigned int keysym,
+                                    unsigned int modifiers)
+{
+  modifiers &= nux::KEY_MODIFIER_SHIFT
+             | nux::KEY_MODIFIER_CTRL
+             | nux::KEY_MODIFIER_ALT
+             | nux::KEY_MODIFIER_SUPER;
+
+  auto handled = false;
+
+  for (auto& accelerator : accelerators_)
+    handled = accelerator->HandleKeyRelease(keysym, modifiers, pressed_state_) || handled;
+
+  switch (keysym)
+  {
+  case GDK_KEY_Shift_L:
+    pressed_state_ &= ~PressedState::LeftShiftPressed;
+    break;
+  case GDK_KEY_Shift_R:
+    pressed_state_ &= ~PressedState::RightShiftPressed;
+    break;
+  case GDK_KEY_Control_L:
+    pressed_state_ &= ~PressedState::LeftControlPressed;
+    break;
+  case GDK_KEY_Control_R:
+    pressed_state_ &= ~PressedState::RightControlPressed;
+    break;
+  case GDK_KEY_Meta_L:
+  case GDK_KEY_Alt_L:
+    pressed_state_ &= ~PressedState::LeftAltPressed;
+    break;
+  case GDK_KEY_Meta_R:
+  case GDK_KEY_Alt_R:
+    pressed_state_ &= ~PressedState::RightAltPressed;
+    break;
+  case GDK_KEY_Super_L:
+    pressed_state_ &= ~PressedState::LeftSuperPressed;
+    break;
+  case GDK_KEY_Super_R:
+    pressed_state_ &= ~PressedState::RightSuperPressed;
+    break;
+  }
+
+  return handled;
+}
+
+} // lockscreen namespace
+} // unity namespace

=== added file 'lockscreen/LockScreenAccelerators.h'
--- lockscreen/LockScreenAccelerators.h	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenAccelerators.h	2014-05-13 20:01:30 +0000
@@ -0,0 +1,94 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 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 warranty of
+ * MERCHANTABILITY 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: William Hua <[e-mail]>
+ */
+
+#ifndef UNITY_LOCKSCREEN_ACCELERATORS
+#define UNITY_LOCKSCREEN_ACCELERATORS
+
+#include <memory>
+#include <sigc++/signal.h>
+#include <vector>
+
+
+namespace unity
+{
+namespace lockscreen
+{
+
+enum class PressedState : unsigned int;
+
+class Accelerator
+{
+public:
+  typedef std::shared_ptr<Accelerator> Ptr;
+
+  Accelerator(unsigned int keysym, unsigned int keycode, unsigned int modifiers);
+  explicit Accelerator(std::string const& string);
+
+  bool operator==(Accelerator const& accelerator) const;
+
+  sigc::signal<void> activated;
+
+private:
+  bool KeyPressActivate();
+  bool KeyReleaseActivate();
+
+  bool HandleKeyPress(unsigned int keysym,
+                      unsigned int modifiers,
+                      PressedState pressed_state);
+  bool HandleKeyRelease(unsigned int keysym,
+                        unsigned int modifiers,
+                        PressedState pressed_state);
+
+  unsigned int keysym_;
+  unsigned int keycode_;
+  unsigned int modifiers_;
+
+  bool active_;
+  bool activated_;
+
+  friend class Accelerators;
+};
+
+class Accelerators
+{
+public:
+  typedef std::shared_ptr<Accelerators> Ptr;
+
+  Accelerators();
+
+  void Clear();
+
+  void Add(Accelerator::Ptr const& accelerator);
+  void Remove(Accelerator::Ptr const& accelerator);
+
+  bool HandleKeyPress(unsigned int keysym,
+                      unsigned int modifiers);
+  bool HandleKeyRelease(unsigned int keysym,
+                        unsigned int modifiers);
+
+private:
+  std::vector<Accelerator::Ptr> accelerators_;
+
+  PressedState pressed_state_;
+};
+
+} // lockscreen namespace
+} // unity namespace
+
+#endif // UNITY_LOCKSCREEN_ACCELERATORS

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-04-30 15:01:34 +0000
+++ lockscreen/LockScreenController.cpp	2014-05-13 20:01:30 +0000
@@ -113,6 +113,7 @@
       shields_.clear();
 
       upstart_wrapper_->Emit("desktop-unlock");
+      accelerator_controller_.reset();
       indicators_.reset();
     }
     else if (!prompt_activation_)
@@ -147,6 +148,12 @@
   });
 }
 
+void Controller::ActivatePanel()
+{
+  if (primary_shield_.IsValid())
+    primary_shield_->ActivatePanel();
+}
+
 void Controller::ResetPostLockScreenSaver()
 {
   screensaver_post_lock_timeout_.reset();
@@ -193,7 +200,7 @@
 
     if (i >= shields_size)
     {
-      shield = shield_factory_->CreateShield(session_manager_, indicators_, i, i == primary);
+      shield = shield_factory_->CreateShield(session_manager_, indicators_, accelerator_controller_->GetAccelerators(), i, i == primary);
       is_new = true;
     }
 
@@ -397,6 +404,12 @@
   indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
   upstart_wrapper_->Emit("desktop-lock");
 
+  accelerator_controller_ = std::make_shared<AcceleratorController>();
+  auto activate_key = WindowManager::Default().activate_indicators_key();
+  auto accelerator = std::make_shared<Accelerator>(activate_key.second, 0, activate_key.first);
+  accelerator->activated.connect(std::bind(std::mem_fn(&Controller::ActivatePanel), this));
+  accelerator_controller_->GetAccelerators()->Add(accelerator);
+
   ShowShields();
 }
 

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-04-30 15:01:34 +0000
+++ lockscreen/LockScreenController.h	2014-05-13 20:01:30 +0000
@@ -25,6 +25,7 @@
 #include <UnityCore/GLibSource.h>
 
 #include "LockScreenShieldFactory.h"
+#include "LockScreenAcceleratorController.h"
 #include "ScreenSaverDBusManager.h"
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/UpstartWrapper.h"
@@ -60,6 +61,7 @@
   void BlankWindowGrabEnable(bool grab);
   void SimulateActivity();
   void ResetPostLockScreenSaver();
+  void ActivatePanel();
 
   void OnLockRequested(bool prompt);
   void OnUnlockRequested();
@@ -74,6 +76,7 @@
   DBusManager::Ptr dbus_manager_;
   session::Manager::Ptr session_manager_;
   indicator::Indicators::Ptr indicators_;
+  AcceleratorController::Ptr accelerator_controller_;
   UpstartWrapper::Ptr upstart_wrapper_;
   ShieldFactoryInterface::Ptr shield_factory_;
 
@@ -99,4 +102,4 @@
 }
 }
 
-#endif
\ No newline at end of file
+#endif

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2014-04-29 21:48:50 +0000
+++ lockscreen/LockScreenPanel.cpp	2014-05-13 20:01:30 +0000
@@ -21,7 +21,6 @@
 
 #include <boost/algorithm/string/trim.hpp>
 #include <Nux/HLayout.h>
-#include <UnityCore/Variant.h>
 
 #include "LockScreenSettings.h"
 #include "panel/PanelIndicatorsView.h"
@@ -39,30 +38,6 @@
 namespace
 {
 const RawPixel PADDING = 5_em;
-
-const std::string MEDIA_KEYS_SCHEMA      = "org.gnome.settings-daemon.plugins.media-keys";
-const std::string MEDIA_KEYS_VOLUME_MUTE = "volume-mute";
-const std::string MEDIA_KEYS_VOLUME_DOWN = "volume-down";
-const std::string MEDIA_KEYS_VOLUME_UP   = "volume-up";
-const std::string INPUT_SWITCH_SCHEMA    = "org.gnome.desktop.wm.keybindings";
-const std::string INPUT_SWITCH_PREVIOUS  = "switch-input-source-backward";
-const std::string INPUT_SWITCH_NEXT      = "switch-input-source";
-
-const std::string INDICATOR_KEYBOARD_BUS_NAME    = "com.canonical.indicator.keyboard";
-const std::string INDICATOR_KEYBOARD_OBJECT_PATH = "/com/canonical/indicator/keyboard";
-const std::string INDICATOR_SOUND_BUS_NAME       = "com.canonical.indicator.sound";
-const std::string INDICATOR_SOUND_OBJECT_PATH    = "/com/canonical/indicator/sound";
-const std::string INDICATOR_ACTION_INTERFACE     = "org.gtk.Actions";
-
-const std::string INDICATOR_KEYBOARD_ACTION_SCROLL = "locked_scroll";
-const std::string INDICATOR_SOUND_ACTION_SCROLL    = "scroll";
-const std::string INDICATOR_SOUND_ACTION_MUTE      = "mute";
-
-const unsigned int MODIFIERS = nux::KEY_MODIFIER_SHIFT |
-                               nux::KEY_MODIFIER_CAPS_LOCK |
-                               nux::KEY_MODIFIER_CTRL |
-                               nux::KEY_MODIFIER_ALT |
-                               nux::KEY_MODIFIER_SUPER;
 }
 
 using namespace indicator;
@@ -74,8 +49,6 @@
   , monitor(monitor_)
   , indicators_(indicators)
   , needs_geo_sync_(true)
-  , media_key_settings_(g_settings_new(MEDIA_KEYS_SCHEMA.c_str()))
-  , input_switch_settings_(g_settings_new(INPUT_SWITCH_SCHEMA.c_str()))
 {
   double scale = unity::Settings::Instance().em(monitor)->DPIScale();
   auto* layout = new nux::HLayout();
@@ -114,11 +87,6 @@
     BuildTexture();
     QueueRelayout();
   });
-
-  ParseAccelerators();
-
-  key_down.connect(sigc::mem_fun(this, &Panel::OnKeyDown));
-  key_up.connect(sigc::mem_fun(this, &Panel::OnKeyUp));
 }
 
 void Panel::BuildTexture()
@@ -180,12 +148,6 @@
     indicators_view_->ActivateEntry(entry_id, 0);
 }
 
-void Panel::ActivateFirst()
-{
-  if (GetInputEventSensitivity())
-    indicators_view_->ActivateIfSensitive();
-}
-
 void Panel::OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const&)
 {
   if (!GetInputEventSensitivity() || (!panel.empty() && panel != GetPanelName()))
@@ -254,210 +216,15 @@
   }
 }
 
-Panel::Accelerator Panel::ParseAcceleratorString(std::string const& string) const
-{
-  guint gtk_key;
-  GdkModifierType gtk_modifiers;
-  gtk_accelerator_parse(string.c_str(), &gtk_key, &gtk_modifiers);
-
-  unsigned int nux_key = gtk_key;
-  unsigned int nux_modifiers = 0;
-
-  if (gtk_modifiers & GDK_SHIFT_MASK)
-    nux_modifiers |= nux::KEY_MODIFIER_SHIFT;
-  if (gtk_modifiers & GDK_LOCK_MASK)
-    nux_modifiers |= nux::KEY_MODIFIER_CAPS_LOCK;
-  if (gtk_modifiers & GDK_CONTROL_MASK)
-    nux_modifiers |= nux::KEY_MODIFIER_CTRL;
-  if (gtk_modifiers & GDK_MOD1_MASK)
-    nux_modifiers |= nux::KEY_MODIFIER_ALT;
-  if (gtk_modifiers & GDK_SUPER_MASK)
-    nux_modifiers |= nux::KEY_MODIFIER_SUPER;
-
-  return std::make_pair(nux_modifiers, nux_key);
-}
-
-void Panel::ParseAccelerators()
-{
-  activate_indicator_ = WindowManager::Default().activate_indicators_key();
-  volume_mute_ = ParseAcceleratorString(glib::String(g_settings_get_string(media_key_settings_, MEDIA_KEYS_VOLUME_MUTE.c_str())));
-  volume_down_ = ParseAcceleratorString(glib::String(g_settings_get_string(media_key_settings_, MEDIA_KEYS_VOLUME_DOWN.c_str())));
-  volume_up_ = ParseAcceleratorString(glib::String(g_settings_get_string(media_key_settings_, MEDIA_KEYS_VOLUME_UP.c_str())));
-
-  auto variant = glib::Variant(g_settings_get_value(input_switch_settings_, INPUT_SWITCH_PREVIOUS.c_str()), glib::StealRef());
-
-  if (g_variant_n_children(variant) > 0)
-  {
-    const gchar *accelerator;
-    g_variant_get_child(variant, 0, "&s", &accelerator);
-    previous_source_ = ParseAcceleratorString(accelerator);
-  }
-  else
-    previous_source_ = std::make_pair(0, 0);
-
-  variant = glib::Variant(g_settings_get_value(input_switch_settings_, INPUT_SWITCH_NEXT.c_str()), glib::StealRef());
-
-  if (g_variant_n_children(variant) > 0)
-  {
-    const gchar *accelerator;
-    g_variant_get_child(variant, 0, "&s", &accelerator);
-    next_source_ = ParseAcceleratorString(accelerator);
-  }
-  else
-    next_source_ = std::make_pair(0, 0);
-}
-
-bool Panel::WillHandleKeyEvent(unsigned int event_type, unsigned long key_sym, unsigned long modifiers)
-{
-  auto is_press = event_type == nux::EVENT_KEY_DOWN;
-
-  /* If we're just pressing a key, and no modifiers are pressed, then
-   * we can start accepting new actions again. */
-  if (is_press && (modifiers & MODIFIERS) == 0)
-    last_action_ = std::make_pair(0, 0);
-
-  return IsMatch(is_press, key_sym, modifiers, activate_indicator_) ||
-         IsMatch(is_press, key_sym, modifiers, volume_mute_) ||
-         IsMatch(is_press, key_sym, modifiers, volume_down_) ||
-         IsMatch(is_press, key_sym, modifiers, volume_up_) ||
-         IsMatch(is_press, key_sym, modifiers, previous_source_) ||
-         IsMatch(is_press, key_sym, modifiers, next_source_);
-}
-
 bool Panel::InspectKeyEvent(unsigned int event_type, unsigned int keysym, const char*)
 {
   return true;
 }
 
-bool Panel::IsMatch(bool is_press,
-                    unsigned int key_sym,
-                    unsigned int state,
-                    Accelerator const& accelerator) const
-{
-  /* Do the easy check, just compare key codes and modifiers.
-   * TODO: Check permutations of modifier-only shortcuts. */
-  return key_sym == accelerator.second && (state & MODIFIERS) == accelerator.first;
-}
-
-void Panel::OnKeyDown(unsigned long event,
-                      unsigned long key_sym,
-                      unsigned long state,
-                      const char* text,
-                      unsigned short repeat)
-{
-  if (IsMatch(true, key_sym, state, activate_indicator_))
-  {
-    ActivateFirst();
-    last_action_ = activate_indicator_;
-  }
-  else if (IsMatch(true, key_sym, state, volume_mute_))
-  {
-    ActivateSoundAction(INDICATOR_SOUND_ACTION_MUTE);
-    last_action_ = volume_mute_;
-  }
-  else if (IsMatch(true, key_sym, state, volume_down_))
-  {
-    ActivateSoundAction(INDICATOR_SOUND_ACTION_SCROLL, g_variant_new_int32(-1));
-    last_action_ = volume_down_;
-  }
-  else if (IsMatch(true, key_sym, state, volume_up_))
-  {
-    ActivateSoundAction(INDICATOR_SOUND_ACTION_SCROLL, g_variant_new_int32(+1));
-    last_action_ = volume_up_;
-  }
-  else if (IsMatch(true, key_sym, state, previous_source_))
-  {
-    ActivateKeyboardAction(INDICATOR_KEYBOARD_ACTION_SCROLL, g_variant_new_int32(-1));
-    last_action_ = previous_source_;
-  }
-  else if (IsMatch(true, key_sym, state, next_source_))
-  {
-    ActivateKeyboardAction(INDICATOR_KEYBOARD_ACTION_SCROLL, g_variant_new_int32(+1));
-    last_action_ = next_source_;
-  }
-}
-
-void Panel::OnKeyUp(unsigned int key_sym,
-                    unsigned long key_code,
-                    unsigned long state)
-{
-  /* We only want to act if we didn't activate the action on key
-   * down. Once we see the key up, we can start accepting actions
-   * again. */
-
-  if (IsMatch(false, key_sym, state, activate_indicator_))
-  {
-    if (last_action_ != activate_indicator_)
-      ActivateFirst();
-
-    last_action_ = std::make_pair(0, 0);
-  }
-  else if (IsMatch(false, key_sym, state, volume_mute_))
-  {
-    if (last_action_ != volume_mute_)
-      ActivateSoundAction(INDICATOR_SOUND_ACTION_MUTE);
-
-    last_action_ = std::make_pair(0, 0);
-  }
-  else if (IsMatch(false, key_sym, state, volume_down_))
-  {
-    if (last_action_ != volume_down_)
-      ActivateSoundAction(INDICATOR_SOUND_ACTION_SCROLL, g_variant_new_int32(-1));
-
-    last_action_ = std::make_pair(0, 0);
-  }
-  else if (IsMatch(false, key_sym, state, volume_up_))
-  {
-    if (last_action_ != volume_up_)
-      ActivateSoundAction(INDICATOR_SOUND_ACTION_SCROLL, g_variant_new_int32(+1));
-
-    last_action_ = std::make_pair(0, 0);
-  }
-  else if (IsMatch(false, key_sym, state, previous_source_))
-  {
-    if (last_action_ != previous_source_)
-      ActivateKeyboardAction(INDICATOR_KEYBOARD_ACTION_SCROLL, g_variant_new_int32(-1));
-
-    last_action_ = std::make_pair(0, 0);
-  }
-  else if (IsMatch(false, key_sym, state, next_source_))
-  {
-    if (last_action_ != next_source_)
-      ActivateKeyboardAction(INDICATOR_KEYBOARD_ACTION_SCROLL, g_variant_new_int32(+1));
-
-    last_action_ = std::make_pair(0, 0);
-  }
-}
-
-void Panel::ActivateIndicatorAction(std::string const& bus_name,
-                                    std::string const& object_path,
-                                    std::string const& action,
-                                    glib::Variant const& parameter) const
-{
-  GVariantBuilder builder;
-
-  g_variant_builder_init(&builder, G_VARIANT_TYPE("(sava{sv})"));
-  g_variant_builder_add(&builder, "s", action.c_str());
-
-  if (parameter)
-    g_variant_builder_add_parsed(&builder, "[%v]", (GVariant*) parameter);
-  else
-    g_variant_builder_add_parsed(&builder, "@av []");
-
-  g_variant_builder_add_parsed(&builder, "@a{sv} []");
-
-  auto proxy = std::make_shared<glib::DBusProxy>(bus_name, object_path, INDICATOR_ACTION_INTERFACE, G_BUS_TYPE_SESSION);
-  proxy->CallBegin("Activate", g_variant_builder_end(&builder), [proxy] (GVariant*, glib::Error const&) {});
-}
-
-void Panel::ActivateKeyboardAction(std::string const& action, glib::Variant const& parameter) const
-{
-  ActivateIndicatorAction(INDICATOR_KEYBOARD_BUS_NAME, INDICATOR_KEYBOARD_OBJECT_PATH, action, parameter);
-}
-
-void Panel::ActivateSoundAction(std::string const& action, glib::Variant const& parameter) const
-{
-  ActivateIndicatorAction(INDICATOR_SOUND_BUS_NAME, INDICATOR_SOUND_OBJECT_PATH, action, parameter);
+void Panel::ActivatePanel()
+{
+  if (GetInputEventSensitivity())
+    indicators_view_->ActivateIfSensitive();
 }
 
 }

=== modified file 'lockscreen/LockScreenPanel.h'
--- lockscreen/LockScreenPanel.h	2014-04-10 16:23:49 +0000
+++ lockscreen/LockScreenPanel.h	2014-05-13 20:01:30 +0000
@@ -22,10 +22,8 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
-#include <UnityCore/GLibDBusProxy.h>
+#include <UnityCore/Indicators.h>
 #include <UnityCore/GLibSource.h>
-#include <UnityCore/GLibWrapper.h>
-#include <UnityCore/Indicators.h>
 #include <UnityCore/SessionManager.h>
 
 namespace unity
@@ -46,7 +44,7 @@
   nux::Property<bool> active;
   nux::Property<int> monitor;
 
-  bool WillHandleKeyEvent(unsigned int event_type, unsigned long key_sym, unsigned long modifiers);
+  void ActivatePanel();
 
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw) override;
@@ -71,52 +69,6 @@
   bool needs_geo_sync_;
   nux::Point tracked_pointer_pos_;
   glib::Source::UniquePtr track_menu_pointer_timeout_;
-
-  glib::Object<GSettings> media_key_settings_;
-  glib::Object<GSettings> input_switch_settings_;
-
-  typedef std::pair<unsigned int, unsigned int> Accelerator;
-  Accelerator ParseAcceleratorString(std::string const& string) const;
-
-  void ParseAccelerators();
-
-  Accelerator activate_indicator_;
-  Accelerator volume_mute_;
-  Accelerator volume_down_;
-  Accelerator volume_up_;
-  Accelerator previous_source_;
-  Accelerator next_source_;
-
-  /* We only want to activate the indicator on key press OR key
-   * release, never both, so we'll need to keep track of the last
-   * action that occurred. However, holding the keys down should
-   * allow multiple activations, for example, when the volume
-   * down button is held down. */
-  Accelerator last_action_;
-
-  bool IsMatch(bool is_press,
-               unsigned int key_sym,
-               unsigned int modifiers,
-               Accelerator const& accelerator) const;
-
-  void OnKeyDown(unsigned long event,
-                 unsigned long key_sym,
-                 unsigned long state,
-                 const char* text,
-                 unsigned short repeat);
-
-  void OnKeyUp(unsigned int key_sym,
-               unsigned long key_code,
-               unsigned long state);
-
-  /* This is just for telling an indicator to do something. */
-  void ActivateIndicatorAction(std::string const& bus_name,
-                               std::string const& object_path,
-                               std::string const& action,
-                               glib::Variant const& parameter = glib::Variant()) const;
-
-  void ActivateKeyboardAction(std::string const& action, glib::Variant const& parameter = glib::Variant()) const;
-  void ActivateSoundAction(std::string const& action, glib::Variant const& parameter = glib::Variant()) const;
 };
 
 } // lockscreen namespace

=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-04-29 17:47:01 +0000
+++ lockscreen/LockScreenShield.cpp	2014-05-13 20:01:30 +0000
@@ -36,8 +36,8 @@
 namespace lockscreen
 {
 
-Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, int monitor_num, bool is_primary)
-  : AbstractShield(session_manager, indicators, monitor_num, is_primary)
+Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)
+  : AbstractShield(session_manager, indicators, accelerators, monitor_num, is_primary)
   , bg_settings_(std::make_shared<BackgroundSettings>())
   , prompt_view_(nullptr)
   , panel_view_(nullptr)
@@ -189,14 +189,25 @@
   return prompt_view;
 }
 
-nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long key_sym, unsigned long modifiers)
+nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
 {
   if (primary)
   {
-    grab_key.emit(modifiers, key_sym);
+    grab_key.emit(modifiers, keysym);
 
-    if (panel_view_ && panel_view_->WillHandleKeyEvent(etype, key_sym, modifiers))
-      return panel_view_;
+    if (accelerators_)
+    {
+      if (etype == nux::EVENT_KEY_DOWN)
+      {
+        if (accelerators_->HandleKeyPress(keysym, modifiers))
+          return panel_view_;
+      }
+      else if (etype == nux::EVENT_KEY_UP)
+      {
+        if (accelerators_->HandleKeyRelease(keysym, modifiers))
+          return panel_view_;
+      }
+    }
 
     if (prompt_view_)
     {
@@ -230,5 +241,11 @@
   return panel_view_ ? panel_view_->active() : false;
 }
 
+void Shield::ActivatePanel()
+{
+  if (panel_view_)
+    panel_view_->ActivatePanel();
+}
+
 }
 }

=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-04-29 01:12:23 +0000
+++ lockscreen/LockScreenShield.h	2014-05-13 20:01:30 +0000
@@ -36,10 +36,11 @@
 class Shield : public AbstractShield
 {
 public:
-  Shield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary);
+  Shield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary);
 
   bool IsIndicatorOpen() const override;
   void CheckCapsLockPrompt() override;
+  void ActivatePanel() override;
 
 protected:
   bool AcceptKeyNavFocus() override;

=== modified file 'lockscreen/LockScreenShieldFactory.cpp'
--- lockscreen/LockScreenShieldFactory.cpp	2014-03-07 18:35:10 +0000
+++ lockscreen/LockScreenShieldFactory.cpp	2014-05-13 20:01:30 +0000
@@ -25,9 +25,9 @@
 namespace lockscreen
 {
 
-nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, int monitor, bool is_primary)
+nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor, bool is_primary)
 {
-  return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, monitor, is_primary));
+  return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, accelerators, monitor, is_primary));
 }
 
 }

=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h	2014-03-07 18:35:10 +0000
+++ lockscreen/LockScreenShieldFactory.h	2014-05-13 20:01:30 +0000
@@ -37,12 +37,12 @@
 
   virtual ~ShieldFactoryInterface() = default;
 
-  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary) = 0;
+  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) = 0;
 };
 
 struct ShieldFactory : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary) override;
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) override;
 };
 
 }

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-04-16 21:34:26 +0000
+++ lockscreen/UserPromptView.cpp	2014-05-13 20:01:30 +0000
@@ -378,10 +378,12 @@
 
 void UserPromptView::AddMessage(std::string const& message, nux::Color const& color)
 {
+  nux::Geometry const& geo = GetGeometry();
   auto* view = new unity::StaticCairoText("");
   view->SetFont(Settings::Instance().font_name());
   view->SetTextColor(color);
   view->SetText(message);
+  view->SetMaximumWidth(geo.width);
 
   msg_layout_->AddView(view);
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-04-30 04:29:00 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-05-13 20:01:30 +0000
@@ -143,6 +143,7 @@
 const RawPixel SCALE_PADDING = 40_em;
 const RawPixel SCALE_SPACING = 20_em;
 const std::string RELAYOUT_TIMEOUT = "relayout-timeout";
+const std::string HUD_UNGRAB_WAIT = "hud-ungrab-wait";
 const std::string FIRST_RUN_STAMP = "first_run.stamp";
 const std::string LOCKED_STAMP = "locked.stamp";
 } // namespace local
@@ -1703,6 +1704,8 @@
         wm.OnScreenGrabbed();
       else if (event->xfocus.mode == NotifyUngrab)
         wm.OnScreenUngrabbed();
+      else if (!screen->grabbed() && event->xfocus.mode == NotifyWhileGrabbed)
+        wm.OnScreenGrabbed();
 
       if (_key_nav_mode_requested)
       {
@@ -2062,6 +2065,7 @@
     return false;
 
   bool was_tap = state & CompAction::StateTermTapped;
+  bool tap_handled = false;
   LOG_DEBUG(logger) << "Super released: " << (was_tap ? "tapped" : "released");
   int when = options[7].value().i();  // XEvent time in millisec
 
@@ -2090,6 +2094,24 @@
     {
       QuicklistManager::Default()->Current()->Hide();
     }
+
+    if (!dash_controller_->IsVisible())
+    {
+      if (!adapter.IsTopWindowFullscreenOnMonitorWithMouse())
+      {
+        if (dash_controller_->ShowDash())
+        {
+          tap_handled = true;
+          ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                                    g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
+        }
+      }
+    }
+    else
+    {
+      dash_controller_->HideDash();
+      tap_handled = true;
+    }
   }
 
   super_keypressed_ = false;
@@ -2103,7 +2125,7 @@
   EnableCancelAction(CancelActionTarget::SHORTCUT_HINT, false);
 
   action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
-  return true;
+  return (was_tap && tap_handled) || !was_tap;
 }
 
 bool UnityScreen::showPanelFirstMenuKeyInitiate(CompAction* action,
@@ -2471,32 +2493,45 @@
 {
   if (switcher_controller_->Visible())
   {
-    LOG_ERROR(logger) << "this should never happen";
+    LOG_ERROR(logger) << "Switcher is visible when showing HUD: this should never happen";
     return false; // early exit if the switcher is open
   }
 
-  if (PluginAdapter::Default().IsTopWindowFullscreenOnMonitorWithMouse())
-  {
-    return false;
-  }
-
   if (hud_controller_->IsVisible())
   {
-    ubus_manager_.SendMessage(UBUS_HUD_CLOSE_REQUEST);
+    hud_controller_->HideHud();
   }
   else
   {
+    auto& wm = WindowManager::Default();
+
+    if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
+      return false;
+
+    if (wm.IsScreenGrabbed())
+    {
+      hud_ungrab_slot_ = wm.screen_ungrabbed.connect([this] { ShowHud(); });
+
+      // Let's wait ungrab event for maximum a couple of seconds...
+      sources_.AddTimeoutSeconds(2, [this] {
+        hud_ungrab_slot_->disconnect();
+        return false;
+      }, local::HUD_UNGRAB_WAIT);
+
+      return false;
+    }
+
     // Handles closing KeyNav (Alt+F1) if the hud is about to show
     if (launcher_controller_->KeyNavIsActive())
       launcher_controller_->KeyNavTerminate(false);
 
-    // If an overlay is open, it must be the dash! Close it!
-    if (launcher_controller_->IsOverlayOpen())
+    if (dash_controller_->IsVisible())
       dash_controller_->HideDash();
 
     if (QuicklistManager::Default()->Current())
       QuicklistManager::Default()->Current()->Hide();
 
+    hud_ungrab_slot_->disconnect();
     hud_controller_->ShowHud();
   }
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-04-29 00:22:03 +0000
+++ plugins/unityshell/src/unityshell.h	2014-05-13 20:01:30 +0000
@@ -421,6 +421,7 @@
 
   UBusManager ubus_manager_;
   glib::SourceManager sources_;
+  connection::Wrapper hud_ungrab_slot_;
 
   CompRegion buffered_compiz_damage_this_frame_;
   CompRegion buffered_compiz_damage_last_frame_;

=== modified file 'tests/data/external.gschema.xml'
--- tests/data/external.gschema.xml	2014-04-08 22:45:07 +0000
+++ tests/data/external.gschema.xml	2014-05-13 20:01:30 +0000
@@ -121,4 +121,25 @@
       <default>false</default>
     </key>
   </schema>
+
+  <schema id="org.gnome.settings-daemon.plugins.media-keys" path="/org/gnome/settings-daemon/plugins/media-keys/">
+    <key type="s" name="volume-mute">
+      <default>'XF86AudioMute'</default>
+    </key>
+    <key type="s" name="volume-down">
+      <default>'XF86AudioLowerVolume'</default>
+    </key>
+    <key type="s" name="volume-up">
+      <default>'XF86AudioRaiseVolume'</default>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.desktop.wm.keybindings" path="/org/gnome/desktop/wm/keybindings/">
+    <key type="as" name="switch-input-source-backward">
+      <default>["&lt;Shift&gt;&lt;Super&gt;space"]</default>
+    </key>
+    <key type="as" name="switch-input-source">
+      <default>["&lt;Super&gt;space"]</default>
+    </key>
+  </schema>
 </schemalist>

=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-04-11 07:26:11 +0000
+++ tests/test_lockscreen_controller.cpp	2014-05-13 20:01:30 +0000
@@ -52,16 +52,17 @@
 struct MockShield : AbstractShield
 {
   MockShield()
-    : AbstractShield(nullptr, nullptr, 0, false)
+    : AbstractShield(nullptr, nullptr, nullptr, 0, false)
   {}
 
   MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
   MOCK_METHOD0(CheckCapsLockPrompt, void());
+  MOCK_METHOD0(ActivatePanel, void());
 };
 
 struct ShieldFactoryMock : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int, bool) override
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int, bool) override
   {
     return nux::ObjectPtr<AbstractShield>(new MockShield());
   }

=== modified file 'unity-shared/DebugDBusInterface.cpp'
--- unity-shared/DebugDBusInterface.cpp	2014-01-15 16:04:41 +0000
+++ unity-shared/DebugDBusInterface.cpp	2014-05-13 20:01:30 +0000
@@ -84,7 +84,8 @@
       {
         if (!g_variant_is_of_type(prop_value, G_VARIANT_TYPE_STRING))
         {
-          LOG_WARNING(logger) << "Unable to match '"<< name << "', it's not a string property.";
+          LOG_WARNING(logger) << "Unable to match '"<< name << "', '" <<
+                                  prop_value << "' is not a string property.";
           return false;
         }
 
@@ -102,7 +103,8 @@
       {
         if (!g_variant_is_of_type(prop_value, G_VARIANT_TYPE_BOOLEAN))
         {
-          LOG_WARNING(logger) << "Unable to match '"<< name << "', it's not a boolean property.";
+          LOG_WARNING(logger) << "Unable to match '"<< name << "', '" <<
+                                  prop_value << "' is not a boolean property.";
           return false;
         }
 
@@ -138,7 +140,8 @@
           case G_VARIANT_CLASS_UINT64:
             return static_cast<uint64_t>(value) == prop_value.GetUInt64();
         default:
-          LOG_WARNING(logger) << "Unable to match '"<< name << "' against property of unknown integer type.";
+          LOG_WARNING(logger) << "Unable to match '"<< name << "', '" <<
+                                  prop_value << "' is not a known integer property.";
         };
       }
 
@@ -152,7 +155,24 @@
 
       IntrospectionData introspection;
       node_->AddProperties(introspection);
-      return g_variant_lookup_value(glib::Variant(introspection.Get()), name.c_str(), nullptr);
+
+      glib::Variant value(g_variant_lookup_value(glib::Variant(introspection.Get()), name.c_str(), nullptr), glib::StealRef());
+
+      if (!value)
+        return nullptr;
+
+      if (!g_variant_is_of_type(value, G_VARIANT_TYPE_ARRAY) || g_variant_n_children(value) != 2)
+      {
+        LOG_ERROR(logger) << "Property value for '"<< name << "' should be a 2-sized array, got instead '" << value << "'";
+        return nullptr;
+      }
+
+      glib::Variant child(g_variant_get_child_value(value, 1), glib::StealRef());
+
+      if (g_variant_is_of_type(child, G_VARIANT_TYPE_VARIANT))
+        return child.GetVariant();
+
+      return child;
     }
 
     std::vector<xpathselect::Node::Ptr> Children() const

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-04-02 21:42:12 +0000
+++ unity-shared/PluginAdapter.cpp	2014-05-13 20:01:30 +0000
@@ -248,7 +248,8 @@
     argument.push_back(arg);
 
   /* Initiate the selected action with the arguments */
-  action->initiate()(action, state, argument);
+  if (CompAction::CallBack const& initiate_cb = primary_action_->initiate())
+    initiate_cb(action, 0, argument);
 }
 
 void MultiActionList::InitiateAll(CompOption::Vector const& extra_args, int state) const
@@ -291,8 +292,11 @@
 
   if (primary_action_)
   {
-    primary_action_->terminate()(primary_action_, CompAction::StateCancel, argument);
-    return;
+    if (CompAction::CallBack const& terminate_cb = primary_action_->terminate())
+    {
+      terminate_cb(primary_action_, CompAction::StateCancel, argument);
+      return;
+    }
   }
 
   for (auto const& it : actions_)
@@ -304,7 +308,8 @@
                            CompAction::StateTermEdge |
                            CompAction::StateTermEdgeDnd))
     {
-      action->terminate()(action, 0, argument);
+      if (CompAction::CallBack const& terminate_cb = primary_action_->terminate())
+        terminate_cb(action, 0, argument);
     }
   }
 }