fix not to display error log about the absense of compose file

[platform/upstream/libxkbcommon.git] / src / xkbcomp / action.h

diff --git a/src/xkbcomp/action.h b/src/xkbcomp/action.h
index 8ec8386..1f92e7b 100644 (file)
--- a/src/xkbcomp/action.h
+++ b/src/xkbcomp/action.h
@@ -33,7 +33,7 @@
  * modified within the files (see calls to SetActionField).
  */
 typedef struct {
-    union xkb_action actions[XkbSA_NumActions + 1];
+    union xkb_action actions[_ACTION_TYPE_NUM_ENTRIES];
 } ActionsInfo;
 
 ActionsInfo *
@@ -43,13 +43,14 @@ void
 FreeActionsInfo(ActionsInfo *info);
 
 bool
-HandleActionDef(ExprDef *def, struct xkb_keymap *keymap,
-                union xkb_action *action, ActionsInfo *info);
+HandleActionDef(struct xkb_context *ctx, ActionsInfo *info,
+                const struct xkb_mod_set *mods, ExprDef *def,
+                union xkb_action *action);
 
 bool
-SetActionField(struct xkb_keymap *keymap, const char *elem, const char *field,
-               ExprDef *array_ndx, ExprDef *value, ActionsInfo *info);
+SetActionField(struct xkb_context *ctx, ActionsInfo *info,
+               struct xkb_mod_set *mods, const char *elem,
+               const char *field, ExprDef *array_ndx, ExprDef *value);
 
-extern const LookupEntry ctrlNames[];
 
 #endif