Merge remote-tracking branch 'origin/wlroots' into swaybar-layers

2 files changed, 3 insertions, 3 deletions

diff --git a/sway/config/bar.c b/sway/config/bar.c
index 10abdef7..48b2fc7c 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -202,7 +202,7 @@ void invoke_swaybar(struct bar_config *bar) {
 }
 
 static bool active_output(const char *name) {
-        swayc_t *cont = NULL;
+        struct sway_container *cont = NULL;
         for (int i = 0; i < root_container.children->length; ++i) {
                 cont = root_container.children->items[i];
                 if (cont->type == C_OUTPUT && strcasecmp(name, cont->name) == 0) {
diff --git a/sway/config/output.c b/sway/config/output.c
index c3ec61b7..b4e56efa 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -120,14 +120,14 @@ void terminate_swaybg(pid_t pid) {
         }
 }
 
-void apply_output_config(struct output_config *oc, swayc_t *output) {
+void apply_output_config(struct output_config *oc, struct sway_container *output) {
         assert(output->type == C_OUTPUT);
 
         struct wlr_output *wlr_output = output->sway_output->wlr_output;
         if (oc && oc->enabled == 0) {
                 wlr_output_layout_remove(root_container.sway_root->output_layout,
                         wlr_output);
-                destroy_output(output);
+                container_output_destroy(output);
                 return;
         }