diff options
author | 2018-07-23 20:27:56 -0400 | |
---|---|---|
committer | 2018-07-23 20:31:11 -0400 | |
commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /swaybar/status_line.c | |
parent | Implement pid->workspace tracking (diff) | |
parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'swaybar/status_line.c')
-rw-r--r-- | swaybar/status_line.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index e0e7414a..bc47580b 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c | |||
@@ -49,14 +49,14 @@ bool status_handle_readable(struct status_line *status) { | |||
49 | json_object *version; | 49 | json_object *version; |
50 | if (json_object_object_get_ex(proto, "version", &version) | 50 | if (json_object_object_get_ex(proto, "version", &version) |
51 | && json_object_get_int(version) == 1) { | 51 | && json_object_get_int(version) == 1) { |
52 | wlr_log(L_DEBUG, "Switched to i3bar protocol."); | 52 | wlr_log(WLR_DEBUG, "Switched to i3bar protocol."); |
53 | status->protocol = PROTOCOL_I3BAR; | 53 | status->protocol = PROTOCOL_I3BAR; |
54 | } | 54 | } |
55 | json_object *click_events; | 55 | json_object *click_events; |
56 | if (json_object_object_get_ex( | 56 | if (json_object_object_get_ex( |
57 | proto, "click_events", &click_events) | 57 | proto, "click_events", &click_events) |
58 | && json_object_get_boolean(click_events)) { | 58 | && json_object_get_boolean(click_events)) { |
59 | wlr_log(L_DEBUG, "Enabled click events."); | 59 | wlr_log(WLR_DEBUG, "Enabled click events."); |
60 | status->i3bar_state.click_events = true; | 60 | status->i3bar_state.click_events = true; |
61 | const char *events_array = "[\n"; | 61 | const char *events_array = "[\n"; |
62 | ssize_t len = strlen(events_array); | 62 | ssize_t len = strlen(events_array); |
@@ -91,7 +91,7 @@ struct status_line *status_line_init(char *cmd) { | |||
91 | int pipe_read_fd[2]; | 91 | int pipe_read_fd[2]; |
92 | int pipe_write_fd[2]; | 92 | int pipe_write_fd[2]; |
93 | if (pipe(pipe_read_fd) != 0 || pipe(pipe_write_fd) != 0) { | 93 | if (pipe(pipe_read_fd) != 0 || pipe(pipe_write_fd) != 0) { |
94 | wlr_log(L_ERROR, "Unable to create pipes for status_command fork"); | 94 | wlr_log(WLR_ERROR, "Unable to create pipes for status_command fork"); |
95 | exit(1); | 95 | exit(1); |
96 | } | 96 | } |
97 | 97 | ||