Merge lp:~laney/unity/keygrabber-xf86 into lp:unity

[Iain Lane]

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

Some keys are being saved in gsettings without the XF86 prefix.

If we can't find a key (get "Disabled" from Compiz), try prefixing "XF86"

https://git.gnome.org/browse/mutter/commit/src/core/meta-accel-parse.c?id=8d29d22e991f8816f47529e366a947b3565993e8

I think this could be SRUed too, since the linked bug mentions the problem on 14.04.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3876
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~laney/unity/keygrabber-xf86/+merge/236842/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/1090/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/177
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/177/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1090/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Thanks!

review: Approve

=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp	2014-02-28 18:52:30 +0000
+++ unity-shared/GnomeKeyGrabber.cpp	2014-10-03 16:54:04 +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);