diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-02-10 20:31:57 -0800 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-12 13:27:43 +1000 |
commit | cdc2551ef6d644073e3583177ead69ed32045bae (patch) | |
tree | 28a96b8032e246f3804498b1f9c1ee27dcb4fa9a | |
parent | 19734cfead4b8c7a5d592fe0fe5634cb4a1ed34d (diff) |
Use C99 struct initializer for cmdNames in applyComponentNames
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | setxkbmap.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/setxkbmap.c b/setxkbmap.c index e50ad16..29a37a2 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -1018,13 +1018,15 @@ applyComponentNames(void) /* Upload the new description to the server. */ if (dpy && !print && !query) { - XkbComponentNamesRec cmdNames; - cmdNames.types = settings.types.value; - cmdNames.compat = settings.compat.value; - cmdNames.symbols = settings.symbols.value; - cmdNames.keycodes = settings.keycodes.value; - cmdNames.geometry = settings.geometry.value; - cmdNames.keymap = settings.keymap.value; + XkbComponentNamesRec cmdNames = { + .keymap = settings.keymap.value, + .keycodes = settings.keycodes.value, + .types = settings.types.value, + .compat = settings.compat.value, + .symbols = settings.symbols.value, + .geometry = settings.geometry.value + }; + xkb = XkbGetKeyboardByName(dpy, deviceSpec, &cmdNames, XkbGBN_AllComponentsMask, XkbGBN_AllComponentsMask & |