Merge lp:~unity-team/unity/trusty-1302885 into lp:unity/7.2

[Stephen M. Webb]

When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME gives us unprefixed keys sometimes.

When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME gives us unprefixed keys sometimes. Fixes #1302885.

This change is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-11 14:55:00 +0000
@@ -1,3 +1,10 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME
+    gives us unprefixed keys sometimes (lp: #1302885).
+
+ -- Iain Lane <[e-mail]>  Mon, 08 Dec 2014 18:03:46 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]
@@ -2189,6 +2196,9 @@
 unity (7.0.0daily13.05.08ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   * Automatic snapshot from revision 3317 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 31 May 2013 04:06:11 +0000
+
 unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]

=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp	2014-02-28 18:52:30 +0000
+++ unity-shared/GnomeKeyGrabber.cpp	2014-12-11 14:55:00 +0000
@@ -200,6 +200,15 @@
   CompAction action;
   action.keyFromString(accelerator);
 
+  if (action.key().toString().empty())
+  {
+      CompString prefixed = "XF86" + CompString(accelerator);
+      LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
+      action.keyFromString(prefixed);
+  }
+  else
+      LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
+
   if (!isActionPostponed(action))
   {
     action.setState(CompAction::StateInitKey);