aboutsummaryrefslogtreecommitdiff
path: root/swaybar
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-12-17 15:52:34 -0500
committerDrew DeVault <sir@cmpwn.com>2017-12-17 15:52:34 -0500
commitd0bd0ed59887fdbcbe0630c23e5d1cc6a254340c (patch)
tree4444227f247f9b7cdb854144eb4332e607c34987 /swaybar
parent1c4a086e7556475139960a25cb642f115d057c23 (diff)
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')
-rw-r--r--swaybar/status_line.c5
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 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <json-c/json.h>
-#include "sway_json_helper.h"
#include "swaybar/config.h"
#include "swaybar/status_line.h"
#include "log.h"
@@ -70,7 +70,8 @@ static void parse_json(struct bar *bar, const char *text) {
bar->status->block_line = create_list();
- for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) {
+ int i;
+ for (i = 0; i < json_object_array_length(results); ++i) {
json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
json_object *name, *instance, *separator, *separator_block_width;
json_object *background, *border, *border_top, *border_bottom;