diff options
| author |  Ian Fan <ianfan0@gmail.com> | 2018-07-18 11:40:16 +0100 |
|---|---|---|
| committer | Ian Fan <ianfan0@gmail.com> | 2018-08-01 16:57:15 +0100 |
| commit | 75aba004603e35c80eda397c2e987f2c3e75cbf5 (patch) | |
| tree | 7f87717e596614e7a68aa8cedd73f74b4b19e4fa /sway/ipc-server.c | |
| parent | ipc: add workspace::reload event (diff) | |
| download | sway-75aba004603e35c80eda397c2e987f2c3e75cbf5.tar.gz sway-75aba004603e35c80eda397c2e987f2c3e75cbf5.tar.zst sway-75aba004603e35c80eda397c2e987f2c3e75cbf5.zip | |
ipc: always include old property in workspace events
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 8fceafa2..dc6b353b 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
| @@ -298,13 +298,11 @@ void ipc_event_workspace(struct sway_container *old, | |||
| 298 | wlr_log(WLR_DEBUG, "Sending workspace::%s event", change); | 298 | wlr_log(WLR_DEBUG, "Sending workspace::%s event", change); |
| 299 | json_object *obj = json_object_new_object(); | 299 | json_object *obj = json_object_new_object(); |
| 300 | json_object_object_add(obj, "change", json_object_new_string(change)); | 300 | json_object_object_add(obj, "change", json_object_new_string(change)); |
| 301 | if (strcmp("focus", change) == 0) { | 301 | if (old) { |
| 302 | if (old) { | 302 | json_object_object_add(obj, "old", |
| 303 | json_object_object_add(obj, "old", | 303 | ipc_json_describe_container_recursive(old)); |
| 304 | ipc_json_describe_container_recursive(old)); | 304 | } else { |
| 305 | } else { | 305 | json_object_object_add(obj, "old", NULL); |
| 306 | json_object_object_add(obj, "old", NULL); | ||
| 307 | } | ||
| 308 | } | 306 | } |
| 309 | 307 | ||
| 310 | if (new) { | 308 | if (new) { |