StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keycodes: remove KeyNamesInfo::merge 

Not used.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2013-03-04 13:21:42 +02:00 committed by Daniel Stone
parent b06ef2b826
commit 4bd0610f13
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xkbcomp/keycodes.c
View File

@ -118,7 +118,6 @@ typedef struct {
typedef struct { typedef struct {
char *name; char *name;
int errorCount; int errorCount;
enum merge_mode merge;
xkb_keycode_t min_key_code; xkb_keycode_t min_key_code;
xkb_keycode_t max_key_code; xkb_keycode_t max_key_code;
@ -232,7 +231,6 @@ InitKeyNamesInfo(KeyNamesInfo *info, struct xkb_context *ctx)
{ {
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
info->ctx = ctx; info->ctx = ctx;
info->merge = MERGE_DEFAULT;
info->min_key_code = XKB_KEYCODE_MAX; info->min_key_code = XKB_KEYCODE_MAX;
} }
@ -545,7 +543,7 @@ HandleLedNameDef(KeyNamesInfo *info, LedNameDef *def,
return ReportBadType(info->ctx, "indicator", "name", buf, "string"); return ReportBadType(info->ctx, "indicator", "name", buf, "string");
} }
ledi.merge = info->merge; ledi.merge = merge;
ledi.name = name; ledi.name = name;
return AddLedName(info, merge, true, &ledi, def->ndx - 1); return AddLedName(info, merge, true, &ledi, def->ndx - 1);
} }