diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-10-08 10:02:52 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 10:02:52 -0400 |
commit | 43161a7e178b59b6bff3f210f46e21e8bf67e066 (patch) | |
tree | 8550777f6cffe2f692831b5edb77c45c2867adc5 /sway/ipc-server.c | |
parent | Merge pull request #1385 from lbonn/sec-no-hidden (diff) | |
parent | ipc/window-event: fill "container" on close events (diff) | |
download | sway-43161a7e178b59b6bff3f210f46e21e8bf67e066.tar.gz sway-43161a7e178b59b6bff3f210f46e21e8bf67e066.tar.zst sway-43161a7e178b59b6bff3f210f46e21e8bf67e066.zip |
Merge pull request #1387 from lbonn/ipc-work
ipc: various fixes for i3 compat
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r-- | sway/ipc-server.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 26d0be65..9122d548 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -792,11 +792,7 @@ void ipc_event_window(swayc_t *window, const char *change) { | |||
792 | sway_log(L_DEBUG, "Sending window::%s event", change); | 792 | sway_log(L_DEBUG, "Sending window::%s event", change); |
793 | json_object *obj = json_object_new_object(); | 793 | json_object *obj = json_object_new_object(); |
794 | json_object_object_add(obj, "change", json_object_new_string(change)); | 794 | json_object_object_add(obj, "change", json_object_new_string(change)); |
795 | if (strcmp(change, "close") == 0 || !window) { | 795 | json_object_object_add(obj, "container", ipc_json_describe_container_recursive(window)); |
796 | json_object_object_add(obj, "container", NULL); | ||
797 | } else { | ||
798 | json_object_object_add(obj, "container", ipc_json_describe_container(window)); | ||
799 | } | ||
800 | 796 | ||
801 | const char *json_string = json_object_to_json_string(obj); | 797 | const char *json_string = json_object_to_json_string(obj); |
802 | ipc_send_event(json_string, IPC_EVENT_WINDOW); | 798 | ipc_send_event(json_string, IPC_EVENT_WINDOW); |