summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2011-04-22 13:01:26 -0400
committerKristian Høgsberg <krh@bitplanet.net>2011-04-22 13:01:26 -0400
commit95d843de11e9f423db5c5dbe72df9c81d4601a85 (patch)
tree1d9f0cc75fd2a891add5968522c3b4eefbd007e6
parentb1868479ad96b51b3047a0390799258ddd42d78c (diff)
Also fix compositor-wayland event handler
-rw-r--r--compositor/compositor-wayland.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index d4ae9d5..4093f2a 100644
--- a/compositor/compositor-wayland.c
+++ b/compositor/compositor-wayland.c
@@ -446,7 +446,7 @@ update_event_mask(uint32_t mask, void *data)
return 0;
}
-static void
+static int
wayland_compositor_handle_event(int fd, uint32_t mask, void *data)
{
struct wayland_compositor *c = data;
@@ -455,6 +455,8 @@ wayland_compositor_handle_event(int fd, uint32_t mask, void *data)
wl_display_iterate(c->parent.display, WL_DISPLAY_READABLE);
if (mask & WL_EVENT_WRITEABLE)
wl_display_iterate(c->parent.display, WL_DISPLAY_WRITABLE);
+
+ return 1;
}
static void