diff options
| author | emersion <contact@emersion.fr> | 2018-08-04 20:41:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 20:41:45 +0100 |
| commit | 0016f774407cdb96e6fe3b1b9235119d9b398f8b (patch) | |
| tree | bc82fb73e33446c5ec0b50c1bae73658e3eeb6b4 /sway/tree/container.c | |
| parent | 5de2223c6df480759ee6d8f4422c2643491595d0 (diff) | |
| parent | 30e7e0f7c7d3d3ce2851f2e70842d735343fb402 (diff) | |
| download | sway-0016f774407cdb96e6fe3b1b9235119d9b398f8b.tar.xz | |
Merge pull request #2418 from RyanDwyer/separate-root
Separate root-related code
Diffstat (limited to 'sway/tree/container.c')
| -rw-r--r-- | sway/tree/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 4a503652..6da5ac3c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -17,7 +17,6 @@ #include "sway/input/seat.h" #include "sway/ipc-server.h" #include "sway/output.h" -#include "sway/scratchpad.h" #include "sway/server.h" #include "sway/tree/arrange.h" #include "sway/tree/layout.h" @@ -336,7 +335,6 @@ static struct sway_container *container_destroy_noreaping( // Workspaces will refuse to be destroyed if they're the last workspace // on their output. if (!container_workspace_destroy(con)) { - wlr_log(WLR_ERROR, "workspace doesn't want to destroy"); return NULL; } } @@ -347,7 +345,7 @@ static struct sway_container *container_destroy_noreaping( container_set_dirty(con); if (con->scratchpad) { - scratchpad_remove_container(con); + root_scratchpad_remove_container(con); } if (!con->parent) { @@ -1097,7 +1095,7 @@ void container_set_floating(struct sway_container *container, bool enable) { } else { // Returning to tiled if (container->scratchpad) { - scratchpad_remove_container(container); + root_scratchpad_remove_container(container); } container_remove_child(container); struct sway_container *reference = |