From 6b44a26ad078cf465607b775084a669e819d8576 Mon Sep 17 00:00:00 2001 From: Aareon Sullivan Date: Wed, 27 Feb 2019 14:19:39 -0800 Subject: [PATCH 1/2] Fixed typo in output_destroy_notify * Fix misspelled function name output_destroy_notify * Fix function definition also * As well as one usage --- kiwmi/output.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kiwmi/output.c b/kiwmi/output.c index 4821651..6212aff 100644 --- a/kiwmi/output.c +++ b/kiwmi/output.c @@ -16,7 +16,7 @@ #include "kiwmi/server.h" static void output_frame_notify(struct wl_listener *listener, void *data); -static void output_destroy_nofity(struct wl_listener *listener, void *data); +static void output_destroy_notify(struct wl_listener *listener, void *data); struct kiwmi_output * output_create(struct wlr_output *wlr_output, struct kiwmi_server *server) @@ -32,7 +32,7 @@ output_create(struct wlr_output *wlr_output, struct kiwmi_server *server) output->frame.notify = output_frame_notify; wl_signal_add(&wlr_output->events.frame, &output->frame); - output->destroy.notify = output_destroy_nofity; + output->destroy.notify = output_destroy_notify; wl_signal_add(&wlr_output->events.destroy, &output->destroy); return output; @@ -58,7 +58,7 @@ output_frame_notify(struct wl_listener *listener, void *data) } static void -output_destroy_nofity(struct wl_listener *listener, void *data) +output_destroy_notify(struct wl_listener *listener, void *data) { struct kiwmi_output *output = wl_container_of(listener, output, destroy); From 176131de99c9b685e4f1a4278f485d663149993f Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Wed, 6 Mar 2019 16:26:04 -0700 Subject: [PATCH 2/2] fix socket being logged before we have the socket --- kiwmi/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kiwmi/server.c b/kiwmi/server.c index bcbf1d2..5e2f2fe 100644 --- a/kiwmi/server.c +++ b/kiwmi/server.c @@ -52,9 +52,6 @@ server_init(struct kiwmi_server *server) bool server_run(struct kiwmi_server *server) { - wlr_log( - WLR_DEBUG, "Running Wayland server on display '%s'", server->socket); - server->socket = wl_display_add_socket_auto(server->wl_display); if (!server->socket) { wlr_log(WLR_ERROR, "Failed to open Wayland socket"); @@ -63,6 +60,9 @@ server_run(struct kiwmi_server *server) return false; } + wlr_log( + WLR_DEBUG, "Running Wayland server on display '%s'", server->socket); + if (!wlr_backend_start(server->backend)) { wlr_log(WLR_ERROR, "Failed to start backend"); wlr_backend_destroy(server->backend);