diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-09 16:23:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 16:23:03 -0700 |
| commit | fbeef1322f5d10c1e2dac0d7de2358a59f442455 (patch) | |
| tree | 76624b3d4820551261e5c15f773c403c1a41264e /sway/server.c | |
| parent | ebcdce457a318a0c23509fe1e5ab3a3dc94f24b6 (diff) | |
| parent | 63b4bf500020cf35cebfdce2d73f8e359ff495c2 (diff) | |
| download | sway-fbeef1322f5d10c1e2dac0d7de2358a59f442455.tar.xz | |
Merge pull request #2234 from emersion/wlr-log-prefix
Update for swaywm/wlroots#1126
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/server.c b/sway/server.c index cd15f454..1d8eb964 100644 --- a/sway/server.c +++ b/sway/server.c @@ -29,20 +29,20 @@ #include "sway/xwayland.h" bool server_privileged_prepare(struct sway_server *server) { - wlr_log(L_DEBUG, "Preparing Wayland server initialization"); + wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); server->wl_display = wl_display_create(); server->wl_event_loop = wl_display_get_event_loop(server->wl_display); server->backend = wlr_backend_autocreate(server->wl_display, NULL); if (!server->backend) { - wlr_log(L_ERROR, "Unable to create backend"); + wlr_log(WLR_ERROR, "Unable to create backend"); return false; } return true; } bool server_init(struct sway_server *server) { - wlr_log(L_DEBUG, "Initializing Wayland server"); + wlr_log(WLR_DEBUG, "Initializing Wayland server"); struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); assert(renderer); @@ -116,7 +116,7 @@ bool server_init(struct sway_server *server) { server->socket = wl_display_add_socket_auto(server->wl_display); if (!server->socket) { - wlr_log(L_ERROR, "Unable to open wayland socket"); + wlr_log(WLR_ERROR, "Unable to open wayland socket"); wlr_backend_destroy(server->backend); return false; } @@ -141,10 +141,10 @@ void server_fini(struct sway_server *server) { } void server_run(struct sway_server *server) { - wlr_log(L_INFO, "Running compositor on wayland display '%s'", + wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", server->socket); if (!wlr_backend_start(server->backend)) { - wlr_log(L_ERROR, "Failed to start backend"); + wlr_log(WLR_ERROR, "Failed to start backend"); wlr_backend_destroy(server->backend); return; } |