all my changes while i was offline.

[chaz/openbox] / plugins / keyboard / tree.c

diff --git a/plugins/keyboard/tree.c b/plugins/keyboard/tree.c
index b7f51888f75d396322d24f486bc59d167cd50d4a..896f77bb4cc1382f4390f7ff26aa84712812e7b1 100644 (file)
--- 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 (it = tree->actions; it != NULL; it = it->next)
+                action_free(it->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;