Merge branch 'master' of https://github.com/buffet/kiwmi
This commit is contained in:
commit
cde9124bb3
2 changed files with 6 additions and 6 deletions
|
@ -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 *UNUSED(data))
|
||||
output_destroy_notify(struct wl_listener *listener, void *UNUSED(data))
|
||||
{
|
||||
struct kiwmi_output *output = wl_container_of(listener, output, destroy);
|
||||
|
||||
|
|
|
@ -63,9 +63,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");
|
||||
|
@ -74,6 +71,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);
|
||||
|
|
Loading…
Reference in a new issue