Merge branch 'backport' into work

[chaz/openbox] / openbox / misc.h

diff --git a/openbox/misc.h b/openbox/misc.h
index c73c92658be2c974060f56eb7595525563cfc719..05b5ac85d0f6e2b4203330ea7b1794e1adace9d8 100644 (file)
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -60,7 +60,8 @@ typedef enum
 {
     OB_STATE_STARTING,
     OB_STATE_RUNNING,
-    OB_STATE_EXITING
+    OB_STATE_EXITING,
+    OB_STATE_RECONFIGURING
 } ObState;
 
 typedef enum
@@ -107,6 +108,7 @@ typedef enum {
     OB_USER_ACTION_MOUSE_DOUBLE_CLICK,
     OB_USER_ACTION_MOUSE_MOTION,
     OB_USER_ACTION_MENU_SELECTION,
+    OB_USER_ACTION_HOOK,
     OB_NUM_USER_ACTIONS
 } ObUserAction;