alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu: Prune empty container when an only child gets promoted to the root set

Browse Source
This commit is contained in:
Jakub Sitnicki
2014-07-07 06:23:22 +02:00
parent f724f4a57d
commit 97101f1f82
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mu-threader.c
View File

@ -388,7 +388,7 @@ prune_maybe (MuContainer *c)
if (cur->flags & MU_CONTAINER_FLAG_DELETE)
c = mu_container_remove_child (c, cur);
else if (cur->flags & MU_CONTAINER_FLAG_SPLICE)
c = mu_container_splice_children (c, cur);
c = mu_container_splice_grandchildren (c, cur);
}
g_return_val_if_fail (c, FALSE);
@ -433,17 +433,10 @@ prune_empty_containers (MuContainer *root_set)
/* and prune the root_set itself... */
for (cur = root_set; cur; cur = cur->next) {
if (cur->flags & MU_CONTAINER_FLAG_DELETE)
root_set = mu_container_remove_sibling (root_set, cur);
else if (cur->flags & MU_CONTAINER_FLAG_SPLICE) {
MuContainer *newchild;
newchild = cur->child;
cur->child = NULL;
root_set = mu_container_append_siblings (root_set,
newchild);
}
else if (cur->flags & MU_CONTAINER_FLAG_SPLICE)
root_set = mu_container_splice_children (root_set, cur);
}
return root_set;