Replace deprecated xkbcommon symbols with current names
These symbols (xkb_map_* and others) were replaced in xkbcommon with more
consistent names. See the header xkbcommon/xkbcommon-compat.h for how
the old names map to the new.
The new names have been available since the first stable xkbcommon
release (0.2.0).
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index d5ea925..57e850f 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -1436,10 +1436,10 @@
goto error;
}
- keymap = xkb_map_new_from_string(input->compositor->base.xkb_context,
- map_str,
- XKB_KEYMAP_FORMAT_TEXT_V1,
- 0);
+ keymap = xkb_keymap_new_from_string(input->compositor->base.xkb_context,
+ map_str,
+ XKB_KEYMAP_FORMAT_TEXT_V1,
+ 0);
munmap(map_str, size);
if (!keymap) {
@@ -1465,7 +1465,7 @@
weston_seat_init_keyboard(&input->base, keymap);
if (keymap)
- xkb_map_unref(keymap);
+ xkb_keymap_unref(keymap);
return;