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 /swaygrab | |
| parent | 1c4a086e7556475139960a25cb642f115d057c23 (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 'swaygrab')
| -rw-r--r-- | swaygrab/json.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/swaygrab/json.c b/swaygrab/json.c index f0e8fa90..286085c3 100644 --- a/swaygrab/json.c +++ b/swaygrab/json.c @@ -50,7 +50,8 @@ static json_object *get_focused_container_r(json_object *c) { } else { json_object *nodes, *node, *child; json_object_object_get_ex(c, "nodes", &nodes); - for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + int i; + for (i = 0; i < json_object_array_length(nodes); i++) { node = json_object_array_get_idx(nodes, i); if ((child = get_focused_container_r(node))) { @@ -59,7 +60,7 @@ static json_object *get_focused_container_r(json_object *c) { } json_object_object_get_ex(c, "floating_nodes", &nodes); - for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) { + for (i = 0; i < json_object_array_length(nodes); i++) { node = json_object_array_get_idx(nodes, i); if ((child = get_focused_container_r(node))) { @@ -82,7 +83,7 @@ char *get_focused_output() { if (!outputs) { sway_abort("Unabled to get focused output. No nodes in tree."); } - for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + for (int i = 0; i < json_object_array_length(outputs); i++) { output = json_object_array_get_idx(outputs, i); if (get_focused_container_r(output)) { @@ -130,7 +131,7 @@ json_object *get_output_container(const char *output) { json_object *outputs, *json_output, *name; json_object_object_get_ex(tree, "nodes", &outputs); - for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) { + for (int i = 0; i < json_object_array_length(outputs); i++) { json_output = json_object_array_get_idx(outputs, i); json_object_object_get_ex(json_output, "name", &name); |