aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/main.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 /swaybar/main.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 '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 @@
4#include <string.h> 4#include <string.h>
5#include <stdbool.h> 5#include <stdbool.h>
6#include <getopt.h> 6#include <getopt.h>
7#include <wlr/util/log.h>
8#include "swaybar/bar.h" 7#include "swaybar/bar.h"
9#include "ipc-client.h" 8#include "ipc-client.h"
9#include "log.h"
10 10
11static struct swaybar swaybar; 11static struct swaybar swaybar;
12 12
@@ -74,13 +74,13 @@ int main(int argc, char **argv) {
74 } 74 }
75 75
76 if (debug) { 76 if (debug) {
77 wlr_log_init(WLR_DEBUG, NULL); 77 sway_log_init(SWAY_DEBUG, NULL);
78 } else { 78 } else {
79 wlr_log_init(WLR_INFO, NULL); 79 sway_log_init(SWAY_INFO, NULL);
80 } 80 }
81 81
82 if (!swaybar.id) { 82 if (!swaybar.id) {
83 wlr_log(WLR_ERROR, "No bar_id passed. " 83 sway_log(SWAY_ERROR, "No bar_id passed. "
84 "Provide --bar_id or let sway start swaybar"); 84 "Provide --bar_id or let sway start swaybar");
85 return 1; 85 return 1;
86 } 86 }
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
88 if (!socket_path) { 88 if (!socket_path) {
89 socket_path = get_socketpath(); 89 socket_path = get_socketpath();
90 if (!socket_path) { 90 if (!socket_path) {
91 wlr_log(WLR_ERROR, "Unable to retrieve socket path"); 91 sway_log(SWAY_ERROR, "Unable to retrieve socket path");
92 return 1; 92 return 1;
93 } 93 }
94 } 94 }