changes

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 2c787e4b483dbd55684aeb4489692d2166c90b5e..b6e7770f61a7d70a46a957dff1c4ae6a5064cc79 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -57,9 +57,6 @@ guint config_keyboard_reset_state;
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
-gboolean config_dialog_focus;
-gboolean config_dialog_desktop;
-
 GSList *config_menu_files;
 
 gint config_resist_win;
@@ -325,11 +322,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_TOP;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
         else if (parse_contains("normal", doc, n))
             config_dock_layer = OB_STACKING_LAYER_NORMAL;
         else if (parse_contains("bottom", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_BELOW;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {
         if (parse_contains("horizontal", doc, n))
@@ -511,7 +508,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resize", parse_resize, NULL);
 
-    config_dock_layer = OB_STACKING_LAYER_TOP;
+    config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
     config_dock_x = 0;