From 88cd7616dbeff4367c41757490aa5f6f663a7318 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 9 Jun 2018 11:38:16 +0100 Subject: Fix compilation errors related to disabled outputs --- sway/ipc-json.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sway/ipc-json.c') 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)); -- cgit v1.2.3-54-g00ecf