aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-06-09 11:38:16 +0100
committerLibravatar emersion <contact@emersion.fr>2018-06-09 11:38:16 +0100
commit88cd7616dbeff4367c41757490aa5f6f663a7318 (patch)
treea1ae7547bda8a32ad383585e1d2fedb063b0f69b /sway/ipc-json.c
parentMerge pull request #2115 from RedSoxFan/restore-workspaces (diff)
downloadsway-88cd7616dbeff4367c41757490aa5f6f663a7318.tar.gz
sway-88cd7616dbeff4367c41757490aa5f6f663a7318.tar.zst
sway-88cd7616dbeff4367c41757490aa5f6f663a7318.zip
Fix compilation errors related to disabled outputs
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c7
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
83 return NULL; 83 return NULL;
84} 84}
85 85
86static void ipc_json_describe_output(struct sway_container *container, json_object *object) { 86static void ipc_json_describe_output(struct sway_container *container,
87 json_object *object) {
87 struct wlr_output *wlr_output = container->sway_output->wlr_output; 88 struct wlr_output *wlr_output = container->sway_output->wlr_output;
88 json_object_object_add(object, "type", 89 json_object_object_add(object, "type",
89 json_object_new_string("output")); 90 json_object_new_string("output"));
@@ -141,12 +142,12 @@ static void ipc_json_describe_output(struct sway_container *container, json_obje
141 142
142json_object *ipc_json_describe_disabled_output(struct sway_output *output) { 143json_object *ipc_json_describe_disabled_output(struct sway_output *output) {
143 struct wlr_output *wlr_output = output->wlr_output; 144 struct wlr_output *wlr_output = output->wlr_output;
144 145
145 json_object *object = json_object_new_object(); 146 json_object *object = json_object_new_object();
146 147
147 json_object_object_add(object, "type", json_object_new_string("output")); 148 json_object_object_add(object, "type", json_object_new_string("output"));
148 json_object_object_add(object, "name", 149 json_object_object_add(object, "name",
149 wlr_output->name ? json_object_new_string(wlr_output->name) : NULL); 150 json_object_new_string(wlr_output->name));
150 json_object_object_add(object, "active", json_object_new_boolean(false)); 151 json_object_object_add(object, "active", json_object_new_boolean(false));
151 json_object_object_add(object, "make", 152 json_object_object_add(object, "make",
152 json_object_new_string(wlr_output->make)); 153 json_object_new_string(wlr_output->make));