Merge pull request #836 from acrisci/feature/ipc-recursive-workspace

ipc: recursive workspace containers in event
This commit is contained in:
Drew DeVault 2016-08-04 21:34:39 -04:00 committed by GitHub
commit 91709bd12a

View File

@ -543,14 +543,14 @@ void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) {
json_object_object_add(obj, "change", json_object_new_string(change)); json_object_object_add(obj, "change", json_object_new_string(change));
if (strcmp("focus", change) == 0) { if (strcmp("focus", change) == 0) {
if (old) { if (old) {
json_object_object_add(obj, "old", ipc_json_describe_container(old)); json_object_object_add(obj, "old", ipc_json_describe_container_recursive(old));
} else { } else {
json_object_object_add(obj, "old", NULL); json_object_object_add(obj, "old", NULL);
} }
} }
if (new) { if (new) {
json_object_object_add(obj, "current", ipc_json_describe_container(new)); json_object_object_add(obj, "current", ipc_json_describe_container_recursive(new));
} else { } else {
json_object_object_add(obj, "current", NULL); json_object_object_add(obj, "current", NULL);
} }