diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-07-24 07:43:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-24 07:43:33 -0400 |
| commit | ba8f0da9de3677fd3b0c1d171f5d9bd3b2b8d2a8 (patch) | |
| tree | 6265109dc0030ad6e3a3ae120ba7a4ca5fd1f4e3 | |
| parent | 4637462a6860cebcbf0ff196f84363a452db651d (diff) | |
| parent | 0d461ad98891bc60ea114765379587f42ad94a4d (diff) | |
| download | sway-ba8f0da9de3677fd3b0c1d171f5d9bd3b2b8d2a8.tar.xz | |
Merge pull request #787 from acrisci/bug/ipc-command-result-array
Put ipc command result json in an array
| -rw-r--r-- | sway/commands.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 5cf93c53..ed561764 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -3657,6 +3657,7 @@ void free_cmd_results(struct cmd_results *results) { } const char *cmd_results_to_json(struct cmd_results *results) { + json_object *result_array = json_object_new_array(); json_object *root = json_object_new_object(); json_object_object_add(root, "success", json_object_new_boolean(results->status == CMD_SUCCESS)); if (results->input) { @@ -3665,7 +3666,9 @@ const char *cmd_results_to_json(struct cmd_results *results) { if (results->error) { json_object_object_add(root, "error", json_object_new_string(results->error)); } - const char *json = json_object_to_json_string(root); + json_object_array_add(result_array, root); + const char *json = json_object_to_json_string(result_array); + free(result_array); free(root); return json; } |