commit c9c74156cde72ba5fe772eb17b8db0edd8b3e2f2
author Ran Benita <ran234@gmail.com> Tue Aug 19 23:59:52 2014 +0300
committer Daniel Stone <daniels@collabora.com> Wed Aug 20 01:05:16 2014 -0700
tree 320970c12d3473b8bb53cf1981c63669674cdb69
parent 2e1968fa1f398e8615197378799ace0a4ea907dd

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>

src/compositor-x11.c

diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 984d799..3494e34 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -322,8 +322,7 @@
 	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);