diff options
| author | M Stoeckl <[email protected]> | 2019-01-20 13:51:12 -0500 |
|---|---|---|
| committer | emersion <[email protected]> | 2019-01-21 12:59:42 +0100 |
| commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
| tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/commands/bar.c | |
| parent | 5c834d36e14aaeca4ac1d22b869254d5722af4af (diff) | |
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/commands/bar.c')
| -rw-r--r-- | sway/commands/bar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 2cfc538f..e9360603 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c @@ -1,9 +1,9 @@ #define _POSIX_C_SOURCE 200809 #include <string.h> #include <strings.h> -#include <wlr/util/log.h> #include "sway/commands.h" #include "sway/config.h" +#include "log.h" #include "util.h" // Must be in alphabetical order for bsearch @@ -60,14 +60,14 @@ struct cmd_results *cmd_bar(int argc, char **argv) { for (int i = 0; i < config->bars->length; ++i) { struct bar_config *item = config->bars->items[i]; if (strcmp(item->id, argv[0]) == 0) { - wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]); + sway_log(SWAY_DEBUG, "Selecting bar: %s", argv[0]); bar = item; break; } } if (!bar) { spawn = !config->reading; - wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); + sway_log(SWAY_DEBUG, "Creating bar: %s", argv[0]); bar = default_bar_config(); if (!bar) { return cmd_results_new(CMD_FAILURE, @@ -99,7 +99,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { // Set current bar config->current_bar = bar; - wlr_log(WLR_DEBUG, "Creating bar %s", bar->id); + sway_log(SWAY_DEBUG, "Creating bar %s", bar->id); } if (find_handler(argv[0], bar_config_handlers, |