prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 71aa4e1d90108fe7e94eb9f4a60f14515b9760b5..79f8432c0c498ec69521d6ce760f1ddd7ff21477 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -1,7 +1,7 @@
 #ifndef __config_h
 #define __config_h
 
-#include "dock.h"
+#include "misc.h"
 #include "stacking.h"
 
 #include <glib.h>
@@ -26,17 +26,19 @@ extern gboolean config_opaque_move;
 extern gboolean config_opaque_resize;
 
 /*! The stacking layer the dock will reside in */
-extern StackLayer config_dock_layer;
-/*! The position at which to place the dock */
-extern DockPosition config_dock_pos;
-/*! If config_dock_pos is DockPos_Floating, this is the top-left corner's
+extern ObStackingLayer config_dock_layer;
+/*! Is the dock floating */
+extern gboolean config_dock_floating;
+/*! Where to place the dock if not floating */
+extern ObDirection config_dock_pos;
+/*! If config_dock_floating, this is the top-left corner's
   position */
-extern int config_dock_x;
-/*! If config_dock_pos is DockPos_Floating, this is the top-left corner's
+extern gint config_dock_x;
+/*! If config_dock_floating, this is the top-left corner's
   position */
-extern int config_dock_y;
+extern gint config_dock_y;
 /*! Whether the dock places the dockapps in it horizontally or vertically */
-extern gboolean config_dock_horz;
+extern ObOrientation config_dock_orient;
 /*! Whether to auto-hide the dock when the pointer is not over it */
 extern gboolean config_dock_hide;
 /*! The number of milliseconds to wait before hiding the dock */