diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/desktop/xdg_shell.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-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.c')
-rw-r--r-- | sway/desktop/xdg_shell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 7da86136..b4ac3a68 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c | |||
@@ -485,11 +485,11 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { | |||
485 | struct wlr_xdg_surface *xdg_surface = data; | 485 | struct wlr_xdg_surface *xdg_surface = data; |
486 | 486 | ||
487 | if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { | 487 | if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) { |
488 | wlr_log(WLR_DEBUG, "New xdg_shell popup"); | 488 | sway_log(SWAY_DEBUG, "New xdg_shell popup"); |
489 | return; | 489 | return; |
490 | } | 490 | } |
491 | 491 | ||
492 | wlr_log(WLR_DEBUG, "New xdg_shell toplevel title='%s' app_id='%s'", | 492 | sway_log(SWAY_DEBUG, "New xdg_shell toplevel title='%s' app_id='%s'", |
493 | xdg_surface->toplevel->title, xdg_surface->toplevel->app_id); | 493 | xdg_surface->toplevel->title, xdg_surface->toplevel->app_id); |
494 | wlr_xdg_surface_ping(xdg_surface); | 494 | wlr_xdg_surface_ping(xdg_surface); |
495 | 495 | ||