From 8c6694fd5833b5b69e5c0f1cc550d24257b0336e Mon Sep 17 00:00:00 2001
From: Ran Benita <ran234@gmail.com>
Date: Sun, 2 Sep 2012 18:51:26 +0300
Subject: [PATCH] compat: remove "flags" field from xkb_indicator_map

We don't set this field any more.

Signed-off-by: Ran Benita <ran234@gmail.com>
---
 src/keymap-dump.c    | 6 +++---
 src/xkb-priv.h       | 1 -
 src/xkbcomp/compat.c | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/keymap-dump.c b/src/keymap-dump.c
index 1722d78..949c595 100644
--- a/src/keymap-dump.c
+++ b/src/keymap-dump.c
@@ -579,9 +579,9 @@ write_compat(struct xkb_keymap *keymap, struct buf *buf)
 
     for (i = 0; i < XkbNumIndicators; i++) {
         struct xkb_indicator_map *map = &keymap->indicators[i];
-        if (map->flags == 0 && map->which_groups == 0 &&
-            map->groups == 0 && map->which_mods == 0 &&
-            map->mods.mods == 0 && map->ctrls == 0)
+        if (map->which_groups == 0 && map->groups == 0 &&
+            map->which_mods == 0 && map->mods.mods == 0 &&
+            map->ctrls == 0)
             continue;
         write_indicator_map(keymap, buf, i);
     }
diff --git a/src/xkb-priv.h b/src/xkb-priv.h
index cfa4183..1165812 100644
--- a/src/xkb-priv.h
+++ b/src/xkb-priv.h
@@ -282,7 +282,6 @@ struct xkb_sym_interpret {
 };
 
 struct xkb_indicator_map {
-    unsigned char flags;
     unsigned char which_groups;
     uint32_t groups;
     unsigned char which_mods;
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index b18537b..c19de03 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -163,7 +163,6 @@ typedef struct _LEDInfo {
     enum merge_mode merge;
 
     xkb_atom_t name;
-    unsigned char flags;
     unsigned char which_mods;
     xkb_mod_mask_t mods;
     unsigned char which_groups;
@@ -236,7 +235,6 @@ static void
 ClearIndicatorMapInfo(struct xkb_context *ctx, LEDInfo *info)
 {
     info->name = xkb_atom_intern(ctx, "default");
-    info->flags = 0;
     info->which_mods = 0;
     info->mods = 0;
     info->which_groups = info->groups = 0;
@@ -1081,7 +1079,6 @@ CopyIndicatorMapDefs(CompatInfo *info)
             }
         }
 
-        im->flags = led->flags;
         if (led->groups != 0 && led->which_groups == 0)
             im->which_groups = XkbIM_UseEffective;
         else