mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-25 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2458 from RyanDwyer/cleanup-transactions

Browse source 
Simplify transactions
This commit is contained in:
Drew DeVault 2018-08-15 17:16:32 -04:00 • committed by GitHub
commit 98ed05225e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 51 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/container.c
View file

@ -108,7 +108,6 @@ struct sway_container *container_create(enum sway_container_type type) {
c->layout = L_NONE;
c->type = type;
c->alpha = 1.0f;
c->instructions = create_list();
if (type != C_VIEW) {
c->children = create_list();
@ -140,8 +139,8 @@ void container_free(struct sway_container *cont) {
"Tried to free container which wasn't marked as destroying")) {
return;
}
if (!sway_assert(cont->instructions->length == 0,
"Tried to free container with pending instructions")) {
if (!sway_assert(cont->ntxnrefs == 0, "Tried to free container "
"which is still referenced by transactions")) {
return;
}
free(cont->name);
@ -150,7 +149,6 @@ void container_free(struct sway_container *cont) {
wlr_texture_destroy(cont->title_focused_inactive);
wlr_texture_destroy(cont->title_unfocused);
wlr_texture_destroy(cont->title_urgent);
list_free(cont->instructions);
list_free(cont->children);
list_free(cont->current.children);

2
sway/tree/root.c
View file

@ -26,7 +26,6 @@ void root_create(void) {
root_container.type = C_ROOT;
root_container.layout = L_NONE;
root_container.name = strdup("root");
root_container.instructions = create_list();
root_container.children = create_list();
root_container.current.children = create_list();
wl_signal_init(&root_container.events.destroy);
@ -55,7 +54,6 @@ void root_destroy(void) {
free(root_container.sway_root);
// root_container
list_free(root_container.instructions);
list_free(root_container.children);
list_free(root_container.current.children);
free(root_container.name);