diff options
| author | Ran Benita <ran234@gmail.com> | 2012-09-04 17:20:46 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-09-04 17:20:46 +0300 |
| commit | 5f613988c80c22b84c270b61942195bfb9a77bf7 (patch) | |
| tree | ffffd111129eea5345755d114aa64f3614984d08 /src/xkbcomp/compat.c | |
| parent | af2a8b3a3745078aba3534fb554eea125817f827 (diff) | |
| download | libxkbcommon-5f613988c80c22b84c270b61942195bfb9a77bf7.tar.gz libxkbcommon-5f613988c80c22b84c270b61942195bfb9a77bf7.tar.bz2 libxkbcommon-5f613988c80c22b84c270b61942195bfb9a77bf7.zip | |
Fold keymap->indicator_names into keymap->indicators
This makes sense, since giving a name to an indicator 'activates' the
indicator_map in that index.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/compat.c')
| -rw-r--r-- | src/xkbcomp/compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c index 4059572..69fefe0 100644 --- a/src/xkbcomp/compat.c +++ b/src/xkbcomp/compat.c @@ -967,7 +967,7 @@ CopyIndicatorMapDefs(CompatInfo *info) */ im = NULL; for (i = 0; i < XkbNumIndicators; i++) { - if (keymap->indicator_names[i] == led->name) { + if (keymap->indicators[i].name == led->name) { im = &keymap->indicators[i]; break; } @@ -981,10 +981,10 @@ CopyIndicatorMapDefs(CompatInfo *info) xkb_atom_text(keymap->ctx, led->name)); for (i = 0; i < XkbNumIndicators; i++) { - if (keymap->indicator_names[i] != XKB_ATOM_NONE) + if (keymap->indicators[i].name != XKB_ATOM_NONE) continue; - keymap->indicator_names[i] = led->name; + keymap->indicators[i].name = led->name; im = &keymap->indicators[i]; break; } |