Since xkbcommon-0.3.0, which is required by weston, a NULL argument
doesn't do anything.
Signed-off-by: Ran Benita <ran234@gmail.com>
else
weston_seat_init_keyboard(&input->base, keymap);
else
weston_seat_init_keyboard(&input->base, keymap);
- if (keymap)
- xkb_keymap_unref(keymap);
+ xkb_keymap_unref(keymap);
keymap = x11_compositor_get_keymap(c);
if (weston_seat_init_keyboard(&c->core_seat, keymap) < 0)
return -1;
keymap = x11_compositor_get_keymap(c);
if (weston_seat_init_keyboard(&c->core_seat, keymap) < 0)
return -1;
- if (keymap)
- xkb_keymap_unref(keymap);
+ xkb_keymap_unref(keymap);
x11_compositor_setup_xkb(c);
x11_compositor_setup_xkb(c);
#ifdef ENABLE_XKBCOMMON
if (keyboard->seat->compositor->use_xkbcommon) {
#ifdef ENABLE_XKBCOMMON
if (keyboard->seat->compositor->use_xkbcommon) {
- if (keyboard->xkb_state.state != NULL)
- xkb_state_unref(keyboard->xkb_state.state);
+ xkb_state_unref(keyboard->xkb_state.state);
if (keyboard->xkb_info)
weston_xkb_info_destroy(keyboard->xkb_info);
if (keyboard->xkb_info)
weston_xkb_info_destroy(keyboard->xkb_info);
- if (keyboard->pending_keymap)
- xkb_keymap_unref(keyboard->pending_keymap);
+ xkb_keymap_unref(keyboard->pending_keymap);
if (--xkb_info->ref_count > 0)
return;
if (--xkb_info->ref_count > 0)
return;
- if (xkb_info->keymap)
- xkb_keymap_unref(xkb_info->keymap);
+ xkb_keymap_unref(xkb_info->keymap);
if (xkb_info->keymap_area)
munmap(xkb_info->keymap_area, xkb_info->keymap_size);
if (xkb_info->keymap_area)
munmap(xkb_info->keymap_area, xkb_info->keymap_size);
else
weston_seat_init_keyboard(&seat->base, keymap);
else
weston_seat_init_keyboard(&seat->base, keymap);
- if (keymap)
- xkb_keymap_unref(keymap);
+ xkb_keymap_unref(keymap);