diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-02-27 16:57:42 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-02-28 14:30:39 -0500 |
| commit | d224714afd087cc73d81a6a13baa72b30928bb6e (patch) | |
| tree | 7d6b43357e883bcc5fb816dd09b873d9a4ecf9e0 | |
| parent | bf5a8fbb98282a607ba9120516985d17858b63a4 (diff) | |
Allow update function to not be set in wl_display_get_fd
Ignore previous patch, here's the correct version.
From 4e1bedaaf05b576f5191f8fe3a34904ab9707414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Mon, 27 Feb 2012 15:17:20 +0100
Subject: [PATCH] Allow update function to not be set in wl_display_get_fd
The same check is done in connection_update, and now with
wl_display_flush() there's less need for the client to need to know the
connection mask.
| -rw-r--r-- | src/wayland-client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wayland-client.c b/src/wayland-client.c index d3989ed..9656cb5 100644 --- a/src/wayland-client.c +++ b/src/wayland-client.c @@ -422,7 +422,9 @@ wl_display_get_fd(struct wl_display *display, display->update = update; display->update_data = data; - display->update(display->mask, display->update_data); + if (display->update) + display->update(display->mask, + display->update_data); return display->fd; } |