projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffbddff
)
compositor-x11: Copying xkb_info when creating a seat causes problems
author
Andrew Wedgbury
<andrew.wedgbury@realvnc.com>
Fri, 6 Sep 2013 08:29:12 +0000
(08:29 +0000)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 11 Sep 2013 18:20:35 +0000
(11:20 -0700)
Sorry, I missed updating use of xkb_info in compositor-x11.c.
I've updated the patch.
src/compositor-x11.c
patch
|
blob
|
history
diff --git
a/src/compositor-x11.c
b/src/compositor-x11.c
index
a896612
..
e04ea06
100644
(file)
--- a/
src/compositor-x11.c
+++ b/
src/compositor-x11.c
@@
-160,7
+160,7
@@
x11_compositor_get_keymap(struct x11_compositor *c)
static uint32_t
get_xkb_mod_mask(struct x11_compositor *c, uint32_t in)
{
- struct weston_xkb_info *info =
&
c->core_seat.xkb_info;
+ struct weston_xkb_info *info = c->core_seat.xkb_info;
uint32_t ret = 0;
if ((in & ShiftMask) && info->shift_mod != XKB_MOD_INVALID)