diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
| commit | 9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (patch) | |
| tree | 9961c8705208b2f127133f0533bd305a6f75015e /sway/ipc-json.c | |
| parent | bb66e6d578fdc68fb33d0fde921390d74f20bb31 (diff) | |
| parent | 867fb6aedbbe4cd1c7f4817848682609e8489880 (diff) | |
| download | sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.tar.xz | |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 5d402d1b..b9289e25 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -83,7 +83,8 @@ static const char *ipc_json_get_output_transform(enum wl_output_transform transf return NULL; } -static void ipc_json_describe_output(struct sway_container *container, json_object *object) { +static void ipc_json_describe_output(struct sway_container *container, + json_object *object) { struct wlr_output *wlr_output = container->sway_output->wlr_output; json_object_object_add(object, "type", json_object_new_string("output")); @@ -141,12 +142,12 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje json_object *ipc_json_describe_disabled_output(struct sway_output *output) { struct wlr_output *wlr_output = output->wlr_output; - + json_object *object = json_object_new_object(); json_object_object_add(object, "type", json_object_new_string("output")); json_object_object_add(object, "name", - wlr_output->name ? json_object_new_string(wlr_output->name) : NULL); + json_object_new_string(wlr_output->name)); json_object_object_add(object, "active", json_object_new_boolean(false)); json_object_object_add(object, "make", json_object_new_string(wlr_output->make)); |