move the def'n of the KeyBindingTree

diff --git a/plugins/keyboard/keyboard.h b/plugins/keyboard/keyboard.h
index e2406d936b9ac89bd273ebbfc58af6be0150fe0b..892d4e04bf4c376e408bf24f066278d24da08dc1 100644 (file)
--- a/plugins/keyboard/keyboard.h
+++ b/plugins/keyboard/keyboard.h
@@ -3,19 +3,7 @@
 
 #include <glib.h>
 
-#include "../../kernel/action.h"
-
-typedef struct KeyBindingTree {
-    guint state;
-    guint key;
-    GList *keylist;
-    Action *action;
-
-    /* the next binding in the tree at the same level */
-    struct KeyBindingTree *next_sibling; 
-    /* the first child of this binding (next binding in a chained sequence).*/
-    struct KeyBindingTree *first_child;
-} KeyBindingTree;
+#include "tree.h"
 
 extern KeyBindingTree *firstnode;
 

diff --git a/plugins/keyboard/tree.h b/plugins/keyboard/tree.h
index ab84643f0ebdb493dac31fe72331ca428c7b2461..8750c94ece73624ba8909ab9f463f33a4263e013 100644 (file)
--- a/plugins/keyboard/tree.h
+++ b/plugins/keyboard/tree.h
@@ -1,9 +1,21 @@
 #ifndef __plugin_keyboard_tree_h
 #define __plugin_keyboard_tree_h
 
-#include "keyboard.h"
+#include "../../kernel/action.h"
 #include <glib.h>
 
+typedef struct KeyBindingTree {
+    guint state;
+    guint key;
+    GList *keylist;
+    Action *action;
+
+    /* the next binding in the tree at the same level */
+    struct KeyBindingTree *next_sibling; 
+    /* the first child of this binding (next binding in a chained sequence).*/
+    struct KeyBindingTree *first_child;
+} KeyBindingTree;
+
 void tree_destroy(KeyBindingTree *tree);
 KeyBindingTree *tree_build(GList *keylist);
 void tree_assimilate(KeyBindingTree *node);