summaryrefslogtreecommitdiff
path: root/src/compositor-wayland.c
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2014-08-19 23:59:52 +0300
committerDaniel Stone <daniels@collabora.com>2014-08-20 01:05:16 -0700
commitc9c74156cde72ba5fe772eb17b8db0edd8b3e2f2 (patch)
tree320970c12d3473b8bb53cf1981c63669674cdb69 /src/compositor-wayland.c
parent2e1968fa1f398e8615197378799ace0a4ea907dd (diff)
downloadweston-c9c74156cde72ba5fe772eb17b8db0edd8b3e2f2.tar.gz
Don't protect xkb_*_unref from NULL
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>
Diffstat (limited to 'src/compositor-wayland.c')
-rw-r--r--src/compositor-wayland.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 57e850f2..5f73c787 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -1464,8 +1464,7 @@ input_handle_keymap(void *data, struct wl_keyboard *keyboard, uint32_t format,
else
weston_seat_init_keyboard(&input->base, keymap);
- if (keymap)
- xkb_keymap_unref(keymap);
+ xkb_keymap_unref(keymap);
return;