diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-12-17 15:52:34 -0500 |
commit | d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch) | |
tree | 4444227f247f9b7cdb854144eb4332e607c34987 /swaybar/status_line.c | |
parent | Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15 (diff) | |
download | sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.gz sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.tar.zst sway-d0bd0ed59887fdbcbe0630c23e5d1cc6a254340c.zip |
Revert "Merge remote-tracking branch 'besser82/bugfix/json-c' into 0.15"
This reverts commit 1c4a086e7556475139960a25cb642f115d057c23, reversing
changes made to 1263ea6497c732bfa1835eea4a8ffe2e6ea6e377.
Diffstat (limited to 'swaybar/status_line.c')
-rw-r--r-- | swaybar/status_line.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index e3cc0bf4..87e90caf 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c | |||
@@ -2,8 +2,8 @@ | |||
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <json-c/json.h> | ||
5 | 6 | ||
6 | #include "sway_json_helper.h" | ||
7 | #include "swaybar/config.h" | 7 | #include "swaybar/config.h" |
8 | #include "swaybar/status_line.h" | 8 | #include "swaybar/status_line.h" |
9 | #include "log.h" | 9 | #include "log.h" |
@@ -70,7 +70,8 @@ static void parse_json(struct bar *bar, const char *text) { | |||
70 | 70 | ||
71 | bar->status->block_line = create_list(); | 71 | bar->status->block_line = create_list(); |
72 | 72 | ||
73 | for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) { | 73 | int i; |
74 | for (i = 0; i < json_object_array_length(results); ++i) { | ||
74 | json_object *full_text, *short_text, *color, *min_width, *align, *urgent; | 75 | json_object *full_text, *short_text, *color, *min_width, *align, *urgent; |
75 | json_object *name, *instance, *separator, *separator_block_width; | 76 | json_object *name, *instance, *separator, *separator_block_width; |
76 | json_object *background, *border, *border_top, *border_bottom; | 77 | json_object *background, *border, *border_top, *border_bottom; |