From 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Sun, 20 Jan 2019 13:51:12 -0500 Subject: 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. --- swaymsg/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'swaymsg') diff --git a/swaymsg/main.c b/swaymsg/main.c index e5eee631..2b49f9b9 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -317,7 +317,7 @@ int main(int argc, char **argv) { char *socket_path = NULL; char *cmdtype = NULL; - wlr_log_init(WLR_INFO, NULL); + sway_log_init(SWAY_INFO, NULL); static struct option long_options[] = { {"help", no_argument, NULL, 'h'}, @@ -421,7 +421,7 @@ int main(int argc, char **argv) { free(cmdtype); if (monitor && type != IPC_SUBSCRIBE) { - wlr_log(WLR_ERROR, "Monitor can only be used with -t SUBSCRIBE"); + sway_log(SWAY_ERROR, "Monitor can only be used with -t SUBSCRIBE"); free(socket_path); return 1; } -- cgit v1.2.3-54-g00ecf