summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2014-11-28 12:55:47 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-11-28 12:55:47 +0000
commit942223ad697542fddd69986764d178e084323093 (patch)
tree9c31470b2c8287c72d501931edacb4ce150d834b /unity-shared
parent850afb9889f925fc65fb8f03cffe035b0d8e87f6 (diff)
parent2d4c24b21047fb2371e8271905e8becc7ff00932 (diff)
PanelService: inject special key events back to the root window when a menu is opened
This will make the multimedia keys to work also if an indicator menu is opened. Fixes: #738202, #1389247 Approved by: Andrea Azzarone, PS Jenkins bot (bzr r3890)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/GnomeKeyGrabber.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/unity-shared/GnomeKeyGrabber.cpp b/unity-shared/GnomeKeyGrabber.cpp
index 76c7161c0..563390b46 100644
--- a/unity-shared/GnomeKeyGrabber.cpp
+++ b/unity-shared/GnomeKeyGrabber.cpp
@@ -202,12 +202,14 @@ unsigned int GnomeGrabber::Impl::grabAccelerator(char const* accelerator, unsign
if (action.key().toString().empty())
{
- CompString prefixed = "XF86" + CompString(accelerator);
- LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
- action.keyFromString(prefixed);
+ CompString prefixed = "XF86" + CompString(accelerator);
+ LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
+ action.keyFromString(prefixed);
}
else
- LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
+ {
+ LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
+ }
if (!isActionPostponed(action))
{