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

Proposed by Stephen M. Webb on 2014-12-08
Status: Rejected
Rejected by: Stephen M. Webb on 2014-12-15
Proposed branch: lp:~unity-team/unity/trusty-1302885
Merge into: lp:unity/7.2
Diff against target: 44 lines (+19/-0)
2 files modified
debian/changelog (+10/-0)
unity-shared/GnomeKeyGrabber.cpp (+9/-0)
To merge this branch: bzr merge lp:~unity-team/unity/trusty-1302885
Reviewer Review Type Date Requested Status
Unity Team 2014-12-08 Pending
Review via email: mp+244068@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
lp:~unity-team/unity/trusty-1302885 updated on 2014-12-11
3806. By Stephen M. Webb on 2014-12-08

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

3807. By Stephen M. Webb on 2014-12-11

debian/changelog: fixed formatting

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
2
3 * When grabbing keys, try prefixing "XF86" if the key isn't found. GNOME
4 gives us unprefixed keys sometimes (lp: #1302885).
5
6 -- Iain Lane <iain.lane@canonical.com> Mon, 08 Dec 2014 18:03:46 -0500
7
1unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium8unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
29
3 [ Andrea Azzarone ]10 [ Andrea Azzarone ]
@@ -2189,6 +2196,9 @@
2189unity (7.0.0daily13.05.08ubuntu.unity.next-0ubuntu1) raring; urgency=low2196unity (7.0.0daily13.05.08ubuntu.unity.next-0ubuntu1) raring; urgency=low
21902197
2191 * Automatic snapshot from revision 3317 (ubuntu-unity/next)2198 * Automatic snapshot from revision 3317 (ubuntu-unity/next)
2199
2200 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 31 May 2013 04:06:11 +0000
2201
2192unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low2202unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
21932203
2194 [ Sebastien Bacher ]2204 [ Sebastien Bacher ]
21952205
=== 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 @@
200 CompAction action;200 CompAction action;
201 action.keyFromString(accelerator);201 action.keyFromString(accelerator);
202202
203 if (action.key().toString().empty())
204 {
205 CompString prefixed = "XF86" + CompString(accelerator);
206 LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
207 action.keyFromString(prefixed);
208 }
209 else
210 LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
211
203 if (!isActionPostponed(action))212 if (!isActionPostponed(action))
204 {213 {
205 action.setState(CompAction::StateInitKey);214 action.setState(CompAction::StateInitKey);

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: