Allow update function to not be set in wl_display_get_fd
authorSamuel Rødal <samuel.rodal@nokia.com>
Mon, 27 Feb 2012 15:57:42 +0000 (16:57 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 28 Feb 2012 19:30:39 +0000 (14:30 -0500)
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.

src/wayland-client.c

index d3989ed..9656cb5 100644 (file)
@@ -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;
 }