sway

commit ba8f0da9de3677fd3b0c1d171f5d9bd3b2b8d2a8
parent 4637462a6860cebcbf0ff196f84363a452db651d
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sun, 24 Jul 2016 07:43:33 -0400

Merge pull request #787 from acrisci/bug/ipc-command-result-array

Put ipc command result json in an array
Diffstat:
M
sway/commands.c
 | 
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git 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;
 }