mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 18:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from zandrmartin/fix-unmanaged-node-json

Browse source 
remove unmanaged nodes from get_tree
This commit is contained in:
Drew DeVault 2016-08-02 14:52:48 -04:00 committed by GitHub
parent 506be24b62 9fa92951fe
commit 947570e6df
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/ipc-json.c
View file

@ -204,7 +204,7 @@ static void ipc_json_describe_view(swayc_t *c, json_object *object) {
c->is_floating ? "auto_on" : "auto_off")); // we can't state the cause c->is_floating ? "auto_on" : "auto_off")); // we can't state the cause
json_object_object_add(object, "app_id", c->app_id ? json_object_new_string(c->app_id) : NULL); json_object_object_add(object, "app_id", c->app_id ? json_object_new_string(c->app_id) : NULL);
// we do not include children, floating, unmanaged etc. as views have none // we do not include children, floating etc. as views have none
} }
json_object *ipc_json_describe_container(swayc_t *c) { json_object *ipc_json_describe_container(swayc_t *c) {
@ -373,14 +373,6 @@ json_object *ipc_json_describe_container_recursive(swayc_t *c) {
} }
} }
json_object_object_add(object, "nodes", children); json_object_object_add(object, "nodes", children);
json_object *unmanaged = json_object_new_array();
if (c->unmanaged && c->unmanaged->length > 0) {
for (i = 0; i < c->unmanaged->length; ++i) {
json_object_array_add(unmanaged, ipc_json_describe_container_recursive(c->unmanaged->items[i]));
}
}
json_object_object_add(object, "unmanaged_nodes", unmanaged);
} }
if (c->type == C_ROOT) { if (c->type == C_ROOT) {