Fix the keyboard config to match Tizen 2.0 alpha

[profile/ivi/libxkbcommon.git] / src / xkbcomp / keymap.c

diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index f6e77ea..f3bf821 100644 (file)
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -33,7 +33,7 @@
  * XkmKeyNamesIdx, etc.)
  */
 struct xkb_keymap *
-CompileKeymap(struct xkb_context *context, XkbFile *file)
+CompileKeymap(struct xkb_context *ctx, XkbFile *file)
 {
     unsigned have;
     bool ok;
@@ -41,7 +41,7 @@ CompileKeymap(struct xkb_context *context, XkbFile *file)
     unsigned mainType;
     const char *mainName;
     LEDInfo *unbound = NULL, *next;
-    struct xkb_keymap *keymap = XkbcAllocKeyboard(context);
+    struct xkb_keymap *keymap = XkbcAllocKeyboard(ctx);
     struct {
         XkbFile *keycodes;
         XkbFile *types;
@@ -57,14 +57,6 @@ CompileKeymap(struct xkb_context *context, XkbFile *file)
     mainName = file->name ? file->name : "(unnamed)";
     switch (mainType)
     {
-    case XkmSemanticsFile:
-        required = XkmSemanticsRequired;
-        legal = XkmSemanticsLegal;
-        break;
-    case XkmLayoutFile:        /* standard type  if setxkbmap -print */
-        required = XkmLayoutRequired;
-        legal = XkmKeymapLegal;
-        break;
     case XkmKeymapFile:
         required = XkmKeyNamesIndex | XkmTypesIndex | XkmSymbolsIndex |
                    XkmCompatMapIndex;
@@ -76,7 +68,7 @@ CompileKeymap(struct xkb_context *context, XkbFile *file)
         return false;
     }
     have = 0;
-    ok = 1;
+
     /* Check for duplicate entries in the input file */
     for (file = (XkbFile *) file->defs; file; file = (XkbFile *) file->common.next)
     {
@@ -114,8 +106,6 @@ CompileKeymap(struct xkb_context *context, XkbFile *file)
             WSGO("Unknown file type %d\n", file->type);
             ACTION("Ignored\n");
             continue;
-        case XkmSemanticsFile:
-        case XkmLayoutFile:
         case XkmKeymapFile:
             WSGO("Illegal %s configuration in a %s file\n",
                   XkbcConfigText(file->type), XkbcConfigText(mainType));