Merge lp:~attente/gnome-settings-daemon/1218322 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

Proposed by William Hua on 2014-05-09
Status: Merged
Merged at revision: 468
Proposed branch: lp:~attente/gnome-settings-daemon/1218322
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 55 lines (+35/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu-force-lock-group.patch (+27/-0)
To merge this branch: bzr merge lp:~attente/gnome-settings-daemon/1218322
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-05-09 Approve on 2014-05-12
Review via email: mp+219055@code.launchpad.net

Commit message

Lock XKB group when ISO_Next_Group is pressed.

Description of the change

Lock XKB group when ISO_Next_Group is pressed.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Thanks! I've added the bug reference to the changelog and merged that/uploaded as a SRU

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-09 01:39:02 +0000
3+++ debian/changelog 2014-05-09 19:19:24 +0000
4@@ -1,3 +1,10 @@
5+gnome-settings-daemon (3.8.6.1-0ubuntu12) UNRELEASED; urgency=medium
6+
7+ * debian/patches/ubuntu-force-lock-group.patch:
8+ - Lock the XKB group when ISO_Next_Group is pressed
9+
10+ -- William Hua <william.hua@canonical.com> Fri, 09 May 2014 14:37:33 -0400
11+
12 gnome-settings-daemon (3.8.6.1-0ubuntu11) trusty; urgency=medium
13
14 [ Jackson Doak ]
15
16=== modified file 'debian/patches/series'
17--- debian/patches/series 2014-03-14 06:21:12 +0000
18+++ debian/patches/series 2014-05-09 19:19:24 +0000
19@@ -31,3 +31,4 @@
20 git_new_screencast_keybinding.patch
21 git_enable_auto_hidpi.patch
22 git_micmute.patch
23+ubuntu-force-lock-group.patch
24
25=== added file 'debian/patches/ubuntu-force-lock-group.patch'
26--- debian/patches/ubuntu-force-lock-group.patch 1970-01-01 00:00:00 +0000
27+++ debian/patches/ubuntu-force-lock-group.patch 2014-05-09 19:19:24 +0000
28@@ -0,0 +1,27 @@
29+Index: gnome-settings-daemon-3.8.6.1/plugins/keyboard/gsd-keyboard-manager.c
30+===================================================================
31+--- gnome-settings-daemon-3.8.6.1.orig/plugins/keyboard/gsd-keyboard-manager.c 2014-05-06 00:39:44.000000000 -0400
32++++ gnome-settings-daemon-3.8.6.1/plugins/keyboard/gsd-keyboard-manager.c 2014-05-06 00:43:24.886984876 -0400
33+@@ -583,8 +583,8 @@
34+ XkbSelectEventDetails (dpy,
35+ XkbUseCoreKbd,
36+ XkbStateNotify,
37+- XkbModifierLockMask,
38+- XkbModifierLockMask);
39++ XkbModifierLockMask | XkbGroupLockMask,
40++ XkbModifierLockMask | XkbGroupLockMask);
41+ }
42+
43+ static unsigned
44+@@ -651,6 +651,11 @@
45+ }
46+ }
47+
48++ if (xkbev->state.changed & XkbGroupLockMask) {
49++ /* Fix the locked group to the first group if it was changed by a grp: option. */
50++ XkbLockGroup (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbUseCoreKbd, 0);
51++ }
52++
53+ return GDK_FILTER_CONTINUE;
54+ }
55+

Subscribers

People subscribed via source and target branches

to all changes: