From 14f4c750e8402f71940a717aaf8748eb4e8847c1 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Mon, 30 Jun 2014 12:06:42 +0200 Subject: authors: add note about Tiago --- AUTHORS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 28b400a..0e51a8f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,8 @@ Emilio Pozuelo Monfort Jonny Lamb Marco Barisione -Tiago Vignatti + +Tiago Vignatti is the author of + weston-gtk-shell, the original base for maynard, but did not take + part in maynard's development. Please don't bother him about maynard + specific queries! -- cgit v1.3.1 From a2c3e554b4897b4e386dd4b9682af2f9117afb9b Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 1 Jul 2014 15:41:54 +0100 Subject: Don't loop forever if we can't find our interfaces Just try one wl_display_roundtrip, rather than doing them in a tight loop until we fall off the face of the planet. --- shell/maynard.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shell/maynard.c b/shell/maynard.c index a6c7e6d..85da0fc 100644 --- a/shell/maynard.c +++ b/shell/maynard.c @@ -638,8 +638,13 @@ main (int argc, /* Wait until we have been notified about the compositor, * shell, and shell helper objects */ - while (!desktop->output || !desktop->shell || !desktop->helper) + if (!desktop->output || !desktop->shell || !desktop->helper) wl_display_roundtrip (desktop->display); + if (!desktop->output || !desktop->shell || !desktop->helper) + { + fprintf (stderr, "could not find output, shell or helper modules\n"); + return -1; + } desktop->grid_visible = FALSE; desktop->system_visible = FALSE; -- cgit v1.3.1