summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Wallenstein <halsmit@t-online.de>2010-10-29 11:35:10 +0200
committerPeter Hutterer <peter.hutterer@who-t.net>2010-11-01 13:57:25 +1000
commit281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 (patch)
tree50d2b89fa4a1edb21bd5d7ed29a96ed284ae15d6
parent851a5f6e0c1b2a98d4714d95e40198ab5dc61607 (diff)
Allow uploading a keymap to a single device
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xkbcomp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xkbcomp.c b/xkbcomp.c
index b0df920..892062f 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -1034,12 +1034,13 @@ main(int argc, char *argv[])
break;
default:
WSGO1("Unknown file type %d\n", mapToUse->type);
ok = False;
break;
}
+ result.xkb->device_spec = device_id;
}
else if (inputFormat == INPUT_XKM) /* parse xkm file */
{
unsigned tmp;
bzero((char *) &result, sizeof(result));
if ((result.xkb = XkbAllocKeyboard()) == NULL)
@@ -1050,12 +1051,13 @@ main(int argc, char *argv[])
tmp = XkmReadFile(file, 0, XkmKeymapLegal, &result);
if (tmp == XkmKeymapLegal)
{
ERROR1("Cannot read XKM file \"%s\"\n", inputFile);
ok = False;
}
+ result.xkb->device_spec = device_id;
}
else
{
INFO1("Errors encountered in %s; not compiled.\n", inputFile);
ok = False;
}