aboutsummaryrefslogtreecommitdiff
path: root/swaybar/main.c
diff options
context:
space:
mode:
authorM Stoeckl <code@mstoeckl.com>2019-01-20 13:51:12 -0500
committeremersion <contact@emersion.fr>2019-01-21 12:59:42 +0100
commit1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch)
tree5c3f60e0219cb8b4a1b7cafb760a871661866e32 /swaybar/main.c
parent5c834d36e14aaeca4ac1d22b869254d5722af4af (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 'swaybar/main.c')
-rw-r--r--swaybar/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/swaybar/main.c b/swaybar/main.c
index fa99b1ba..4ef74629 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -4,9 +4,9 @@
#include <string.h>
#include <stdbool.h>
#include <getopt.h>
-#include <wlr/util/log.h>
#include "swaybar/bar.h"
#include "ipc-client.h"
+#include "log.h"
static struct swaybar swaybar;
@@ -74,13 +74,13 @@ int main(int argc, char **argv) {
}
if (debug) {
- wlr_log_init(WLR_DEBUG, NULL);
+ sway_log_init(SWAY_DEBUG, NULL);
} else {
- wlr_log_init(WLR_INFO, NULL);
+ sway_log_init(SWAY_INFO, NULL);
}
if (!swaybar.id) {
- wlr_log(WLR_ERROR, "No bar_id passed. "
+ sway_log(SWAY_ERROR, "No bar_id passed. "
"Provide --bar_id or let sway start swaybar");
return 1;
}
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
if (!socket_path) {
socket_path = get_socketpath();
if (!socket_path) {
- wlr_log(WLR_ERROR, "Unable to retrieve socket path");
+ sway_log(SWAY_ERROR, "Unable to retrieve socket path");
return 1;
}
}