aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/xdg_shell_v6.c
diff options
context:
space:
mode:
authorLibravatar M Stoeckl <code@mstoeckl.com>2019-01-20 13:51:12 -0500
committerLibravatar emersion <contact@emersion.fr>2019-01-21 12:59:42 +0100
commit1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch)
tree5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/desktop/xdg_shell_v6.c
parentLog libinput_config_status errors (diff)
downloadsway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst
sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
-rw-r--r--sway/desktop/xdg_shell_v6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 9f6741c8..553d532d 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -469,11 +469,11 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
469 struct wlr_xdg_surface_v6 *xdg_surface = data; 469 struct wlr_xdg_surface_v6 *xdg_surface = data;
470 470
471 if (xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) { 471 if (xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
472 wlr_log(WLR_DEBUG, "New xdg_shell_v6 popup"); 472 sway_log(SWAY_DEBUG, "New xdg_shell_v6 popup");
473 return; 473 return;
474 } 474 }
475 475
476 wlr_log(WLR_DEBUG, "New xdg_shell_v6 toplevel title='%s' app_id='%s'", 476 sway_log(SWAY_DEBUG, "New xdg_shell_v6 toplevel title='%s' app_id='%s'",
477 xdg_surface->toplevel->title, xdg_surface->toplevel->app_id); 477 xdg_surface->toplevel->title, xdg_surface->toplevel->app_id);
478 wlr_xdg_surface_v6_ping(xdg_surface); 478 wlr_xdg_surface_v6_ping(xdg_surface);
479 479