0.8.8claws111

* src/folder.c
        destroy folder items, when a folder item is removed

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 818c95e1d2da693aab033bef729111be6d00f874..792b2bc5445f4922fa63a483013346d57a0c223b 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-01-17 [christoph] 0.8.8claws111
+
+       * src/folder.c
+               destroy folder items, when a folder item is removed
+
 2003-01-17 [christoph] 0.8.8claws110
 
        * src/folder.c

diff --git a/configure.ac b/configure.ac
index 9f930a99b00a95748df95def97e363381adf5ffa..74bb9e6e47673beb77ed313f64f1334f3aa1d4af 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws110
+EXTRA_VERSION=claws111
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index e4eb3c06b39b5bd321347299605f3c5db4419d47..a5ad8c15f8e11395cd7fffc2eb1830a61970cf5c 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -247,6 +247,11 @@ void folder_item_append(FolderItem *parent, FolderItem *item)
        g_node_append_data(node, item);
 }
 
+gboolean folder_item_remove_func(GNode *node, gpointer data)
+{
+       folder_item_destroy((FolderItem *)node->data);
+}
+
 void folder_item_remove(FolderItem *item)
 {
        GNode *node;
@@ -258,6 +263,9 @@ void folder_item_remove(FolderItem *item)
        node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
        g_return_if_fail(node != NULL);
 
+       g_node_traverse(node, G_POST_ORDER, G_TRAVERSE_ALL, -1,
+                       folder_item_remove_func, NULL);
+
        /* TODO: free all FolderItem's first */
        if (item->folder->node == node)
                item->folder->node = NULL;