aboutsummaryrefslogtreecommitdiff
path: root/sway/config/bar.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/config/bar.c')
-rw-r--r--sway/config/bar.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c
index b1aa2313..0fdac5d8 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -19,10 +19,10 @@
#include "util.h"
static void terminate_swaybar(pid_t pid) {
- wlr_log(WLR_DEBUG, "Terminating swaybar %d", pid);
+ sway_log(SWAY_DEBUG, "Terminating swaybar %d", pid);
int ret = kill(-pid, SIGTERM);
if (ret != 0) {
- wlr_log_errno(WLR_ERROR, "Unable to terminate swaybar %d", pid);
+ sway_log_errno(SWAY_ERROR, "Unable to terminate swaybar %d", pid);
} else {
int status;
waitpid(pid, &status, 0);
@@ -194,7 +194,7 @@ static void invoke_swaybar(struct bar_config *bar) {
// Pipe to communicate errors
int filedes[2];
if (pipe(filedes) == -1) {
- wlr_log(WLR_ERROR, "Pipe setup failed! Cannot fork into bar");
+ sway_log(SWAY_ERROR, "Pipe setup failed! Cannot fork into bar");
return;
}
@@ -227,17 +227,17 @@ static void invoke_swaybar(struct bar_config *bar) {
execvp(cmd[0], cmd);
exit(1);
}
- wlr_log(WLR_DEBUG, "Spawned swaybar %d", bar->pid);
+ sway_log(SWAY_DEBUG, "Spawned swaybar %d", bar->pid);
close(filedes[0]);
size_t len;
if (read(filedes[1], &len, sizeof(size_t)) == sizeof(size_t)) {
char *buf = malloc(len);
if(!buf) {
- wlr_log(WLR_ERROR, "Cannot allocate error string");
+ sway_log(SWAY_ERROR, "Cannot allocate error string");
return;
}
if (read(filedes[1], buf, len)) {
- wlr_log(WLR_ERROR, "%s", buf);
+ sway_log(SWAY_ERROR, "%s", buf);
}
free(buf);
}
@@ -248,7 +248,7 @@ void load_swaybar(struct bar_config *bar) {
if (bar->pid != 0) {
terminate_swaybar(bar->pid);
}
- wlr_log(WLR_DEBUG, "Invoking swaybar for bar id '%s'", bar->id);
+ sway_log(SWAY_DEBUG, "Invoking swaybar for bar id '%s'", bar->id);
invoke_swaybar(bar);
}