add DOCK_NORMAL stacking layer

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 0d81d3f5a667e5bf90699596d0066f8bd695b32f..9279266e9216dfc8f715e1bec7ae941b5dfa243f 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -31,11 +31,11 @@ guint    config_focus_raise;
 
 ObPlacePolicy config_place_policy;
 
-char *config_theme;
+gchar *config_theme;
 
 gchar *config_title_layout;
 
-int     config_desktops_num;
+gint    config_desktops_num;
 GSList *config_desktops_names;
 
 gboolean config_redraw_resize;
@@ -75,7 +75,7 @@ gint config_resist_edge;
 static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                       GList *keylist)
 {
-    char *key;
+    gchar *key;
     ObAction *action;
     xmlNodePtr n, nact;
     GList *it;
@@ -133,8 +133,8 @@ static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                         void *d)
 {
     xmlNodePtr n, nbut, nact;
-    char *buttonstr;
-    char *contextstr;
+    gchar *buttonstr;
+    gchar *contextstr;
     ObUserAction uact;
     ObMouseAction mact;
     ObAction *action;
@@ -322,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;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_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))
@@ -508,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;