X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Ftree.c;h=e60962f30516373863b6903ff14b4a590948e095;hb=23697223a5f7242767c7959158f314f50887985c;hp=b7f51888f75d396322d24f486bc59d167cd50d4a;hpb=739c958ac58154f8b1896113701e1c7f580d4cde;p=chaz%2Fopenbox

diff --git a/plugins/keyboard/tree.c b/plugins/keyboard/tree.c
index b7f51888..e60962f3 100644
--- a/plugins/keyboard/tree.c
+++ b/plugins/keyboard/tree.c
@@ -1,6 +1,5 @@
 #include "keyboard.h"
 #include "translate.h"
-#include "keyaction.h"
 #include <glib.h>
 
 void tree_destroy(KeyBindingTree *tree)
@@ -12,10 +11,13 @@ void tree_destroy(KeyBindingTree *tree)
 	c = tree->first_child;
 	if (c == NULL) {
 	    GList *it;
+            GSList *sit;
 	    for (it = tree->keylist; it != NULL; it = it->next)
 		g_free(it->data);
 	    g_list_free(tree->keylist);
-            keyaction_free(&tree->action);
+	    for (sit = tree->actions; sit != NULL; sit = sit->next)
+                action_free(sit->data);
+	    g_slist_free(tree->actions);
 	}
 	g_free(tree);
 	tree = c;
@@ -32,8 +34,7 @@ KeyBindingTree *tree_build(GList *keylist)
 
     for (it = g_list_last(keylist); it != NULL; it = it->prev) {
 	p = ret;
-	ret = g_new(KeyBindingTree, 1);
-	ret->next_sibling = NULL;
+	ret = g_new0(KeyBindingTree, 1);
 	if (p == NULL) {
 	    GList *it;