X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=42d479aff480ff92d2a7b2688e8978d8f01bc9f4;hb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;hp=b8ffa9a6c488d2ff36833ec9ad7dcce8303ba914;hpb=d206303a9f0742ff330aebe8129d6044ade30a94;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index b8ffa9a6..42d479af 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -15,14 +15,14 @@ GSList *config_desktops_names;
 gboolean config_opaque_move;
 gboolean config_opaque_resize;
 
-StackLayer   config_dock_layer;
-gboolean     config_dock_floating;
-ObDirection  config_dock_pos;
-int          config_dock_x;
-int          config_dock_y;
-gboolean     config_dock_horz;
-gboolean     config_dock_hide;
-guint        config_dock_hide_timeout;
+ObStackingLayer config_dock_layer;
+gboolean        config_dock_floating;
+ObDirection     config_dock_pos;
+gint            config_dock_x;
+gint            config_dock_y;
+ObOrientation   config_dock_orient;
+gboolean        config_dock_hide;
+guint           config_dock_hide_timeout;
 
 static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
 {
@@ -124,17 +124,17 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
-            config_dock_layer = Layer_Top;
+            config_dock_layer = OB_STACKING_LAYER_TOP;
         else if (parse_contains("normal", doc, n))
-            config_dock_layer = Layer_Normal;
+            config_dock_layer = OB_STACKING_LAYER_NORMAL;
         else if (parse_contains("bottom", doc, n))
-            config_dock_layer = Layer_Below;
+            config_dock_layer = OB_STACKING_LAYER_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {
         if (parse_contains("horizontal", doc, n))
-            config_dock_horz = TRUE;
+            config_dock_orient = OB_ORIENTATION_HORZ;
         else if (parse_contains("vertical", doc, n))
-            config_dock_horz = FALSE;
+            config_dock_orient = OB_ORIENTATION_VERT;
     }
     if ((n = parse_find_node("autoHide", node)))
         config_dock_hide = parse_bool(doc, n);
@@ -166,12 +166,12 @@ void config_startup()
 
     parse_register("moveresize", parse_moveresize, NULL);
 
-    config_dock_layer = Layer_Top;
+    config_dock_layer = OB_STACKING_LAYER_TOP;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
     config_dock_x = 0;
     config_dock_y = 0;
-    config_dock_horz = FALSE;
+    config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
     config_dock_hide_timeout = 3000;