Merge branch 'master' into chaz

[chaz/openbox] / openbox / keytree.h

diff --git a/openbox/keytree.h b/openbox/keytree.h
index d3544f80b6988f392d102d9cd5795c0a829e8182..66edc3c7faf0af58ba57827370debed953d6c74d 100644 (file)
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -19,8 +19,6 @@
 #ifndef __plugin_keyboard_tree_h
 #define __plugin_keyboard_tree_h
 
-#include "action.h"
-
 #include <glib.h>
 
 typedef struct KeyBindingTree {
@@ -31,9 +29,9 @@ typedef struct KeyBindingTree {
     gboolean chroot;
 
     /* the level up in the tree */
-    struct KeyBindingTree *parent; 
+    struct KeyBindingTree *parent;
     /* the next binding in the tree at the same level */
-    struct KeyBindingTree *next_sibling; 
+    struct KeyBindingTree *next_sibling;
     /* the first child of this binding (next binding in a chained sequence).*/
     struct KeyBindingTree *first_child;
 } KeyBindingTree;
@@ -44,5 +42,4 @@ void tree_assimilate(KeyBindingTree *node);
 KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict);
 gboolean tree_chroot(KeyBindingTree *tree, GList *keylist);
 
-
 #endif